Merge "Add XML support to the cinder client"