Merge branch 'master' into post-install-services-last

Conflicts:
	cinder/cinder.py
	cinder/component.yml
	fake/fake.py
	glance/component.yml
	glance/glance.py
	keystone/component.yml
	keystone/keystone.py
	mysql/component.yml
	mysql/mysql.py
	nova/component.yml
	nova/nova.py
	quantum/component.yml
	quantum/quantum.py
	rabbitmq/component.yml
	rabbitmq/rabbitmq.py