Updating puppet code to the versions running in prod
Merge remote-tracking branch 'upstream/master' into updating2prod
Updated manifests to more current version

Updated the manifest to a more current version