Merge remote-tracking branch 'mirantis/master' into savanna_murano_heat

Conflicts:
	deployment/puppet/osnailyfacter/examples/site.pp