Merge branch 'fix_rsyslog_develop_rebased'

Conflicts:
	deployment/puppet/openstack/examples/site_openstack_ha_compact.pp
	deployment/puppet/openstack/examples/site_openstack_ha_minimal.pp

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