This should create the required RequestHeader statements in the puppetmaster vhost configuration
Merge branch 'puppetmaster_requestheader' into puppet_master

Conflicts:
	manifests/master.pp