small changes to remove dynamic scoping in order to support puppet 3.x+