Merge remote-tracking branch 'ppouliot/master' into hsmaster_new_apache

Conflicts:
	templates/apache2.conf.erb
	templates/puppet.conf-common.erb
	templates/puppet.conf-master.erb