Merge "Add a config option to select compute xml api"