Merge branch 'typo' into mymaster
Merge branch 'reportfrom' into mymaster
Merge branch 'passenger' into mymaster
Fix bug on server package installation

If puppet::agent is included before puppet::server, then $puppet::server::master
gets ignored, thus the server puppet package does not get included.
This commit fixes the issue by checking the value of the $::puppet_master fact