Updates for 3.3

Prior to this commit we were missing the configurations from 3.3 and
above. This causes the simplified installer to fail. This commit
adds everything listed in
'https://github.com/puppetlabs/enterprise-dist/blob/3.3.x/ext/erb/puppetmaster.conf.erb'