Updates to keep up with puppet_enterprise dev

This assumes that my pull requests to update the `puppet_enterprise`
module will be accepted.