Duplicated hiera lookups removed.

  * removed the puppetdb lookup that were duplicates.
  * standardised them to prefix with puppetmaster::<var>