(maint) Fix wrong filename from being shown in hiera-2 related errors
Merge branch 'master' of ssh://github.com/puppetlabs/puppet.git
Merge branch 'master' of https://github.com/puppetlabs/puppet