fix variable redeclartion
Merge pull request #625 from Mirantis/prd1929

fix variable redeclartion
Merge remote-tracking branch 'mirantis/master' into savanna_murano_heat

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