Fix package dep woes in Puppet

Encode puppet master version into hiera

So that it does not updrade everything to
3.3.0 (which in my experience does not seem
to work)

Also, ensure the same version is already installed
of puppet-common, b/c the upstream packages do not
work correctly.