Temporarily patch around lp:1090592

Conflicts:
	conf/components/glance.yaml
	conf/components/keystone-client.yaml