Update to work with hiera-puppet for Puppet 2, built-in hiera with Puppet 3