Bug 1014047: use directory environments; r=Callek

Note that this makes existing user environments invalid, as they are
located at /etc/puppet/environments/$user/env/, and the "env/" suffix
is not compatible with directory environments.
Merge default -> production

--HG--
branch : production