Changes to align more closely with PuppetLabs recommendations for configuring Puppet to run under Apache/mod_passenger.