Changed 'xml' to 'XML'

Like Lana Brindley mentioned in https://review.openstack.org/#/c/102900/
'xml' should be 'XML' instead.

Change-Id: If500ec9325eff98d58810b69c6fc84211e20638a
Found a useless comment

It seems to be legacy of debug steps done by the developer.

Change-Id: I84484619803b3006583b70c7a49039e9c2924ce6
Merge "Changed 'xml' to 'XML'"
Merge "Found a useless comment"