Merge "Add config options for XML support in Keystone"