Add ability to pass $servername and $ip in apache vhost for puppetmaster