
This was not well tested. Build the argument into a variable which can be eval()ed to produce the final output. Add the flag so we test this during functional tests. Add "-x" to dib invocations so we can more easily debug failures. Change-Id: Ifdc82627c520379b4124ccb9a4c2fe806c52c75c