Fix apache_httpd port with puppet 3.7+ and add puppetserver runtype