(PUP-1151) Fix the master port # (thus addressing a failure on windows)
Merge branch 'master' of https://github.com/puppetlabs/puppet