Merge branch 'poc_fencing'

Conflicts:
	deployment/puppet/osnailyfacter/manifests/cluster_ha.pp

Signed-off-by: Bogdan Dobrelya <bogdando@mail.ru>
Merge branch 'master' of github.com:bogdando/fuel

Conflicts:
	deployment/puppet/osnailyfacter/manifests/cluster_ha.pp

Signed-off-by: Bogdan Dobrelya <bogdando@mail.ru>