Trusty composition of puppet / passenger config

Redo the composition layer of puppet / passenger / puppetdb integration
to align better with the trusty packages and the two-step puppet setup
process we use with setup.pp followed by site.pp.

Closes-Bug: #1311218
Merge pull request #58 from CiscoSystems/bugs/1311218

Trusty composition of puppet / passenger config