Use prettyxml output

minidom's toprettyxml doesn't render well so using etree instead

Change-Id: Iad05d55cfb071b11cb6f6b30aa9f23f33fd8039c
Merge "Use prettyxml output"
Merge remote-tracking branch 'm_src_repo/citrix-fixes' into build-temp