Fix issues related to code consolidation

- decouples hiera interpolation from hiera lookup
- adds placeholders for class/role override code