Merge branch 'pr'

Conflicts:
	data/nodes/2_role.yaml
Merge branch 'master' of github.com:CiscoSystems/openstack-installer