Merge pull request #1 from puppetlabs/master

Merge
Merge pull request #2 from puppetlabs/master

pull from upstream
Fixing ports to be on a unique line
fix - with multiple servers and multiple ports
Fixing merge