Bug 1014047: make environment.conf a managed file; r=Callek

This moves it out of the repository itself, and instead manages the file
with puppet.  For users, it's managed with ensure => present, so it's
easy to edit it if necessary without puppet un-editing it.
Merge default -> production

--HG--
branch : production