Small refactoring changes
Use the hiera_merge pattern proposed by ghoneycutt as a ("not very nice") workaround for
https://tickets.puppetlabs.com/browse/HI-118