[PATCH] BZ815357: buildcmd: surround template xml with CDATA