Remove the master section and all related settings from the puppet.conf that puppet-agent installs. But don't delete the file, as it still needs to be installed by puppet-agent.
SERVER-409 and SERVER-410 make these [master] section settings no longer necessary.
rundir and logdir are no longer relative to vardir
Plumb confdir, vardir, codedir, logdir, rundir values via dependency injection
Explicitly override always_cache_features in puppetserver