Try to merge the puppet stuff for nagios

Hopefully this will be a non merge commit

Co-Authored-By: Alessandro M. Martellone <amartellone@create-net.org>
Co-Authored-By: Federico M. Facca <federico.facca@create-net.org>

Conflicts:
	deployment/puppet/nagios/files/common/etc/nagios/nrpe.d/apt.cfg
	deployment/puppet/nagios/files/common/usr/local/lib/nagios/plugins/check_libs.pl
	deployment/puppet/nagios/manifests/command.pp
	deployment/puppet/nagios/manifests/command/commands.pp
	deployment/puppet/nagios/manifests/common.pp
	deployment/puppet/nagios/manifests/contact.pp
	deployment/puppet/nagios/manifests/host.pp
	deployment/puppet/nagios/manifests/host/hostgroups.pp
	deployment/puppet/nagios/manifests/host/hosts.pp
	deployment/puppet/nagios/manifests/init.pp
	deployment/puppet/nagios/manifests/master.pp
	deployment/puppet/nagios/manifests/params.pp
	deployment/puppet/nagios/manifests/service.pp
	deployment/puppet/nagios/manifests/service/services.pp
	deployment/puppet/nagios/templates/openstack/hostgroups.cfg.erb
	deployment/puppet/nagios/templates/openstack/openstack.cfg.erb
	deployment/puppet/nagios/templates/openstack/sample_services.cfg
	deployment/puppet/nagios/templates/openstack/templates.cfg.erb
	deployment/puppet/nailgun/manifests/init.pp
	deployment/puppet/osnailyfacter/manifests/cluster_ha.pp
	deployment/puppet/osnailyfacter/manifests/cluster_simple.pp