Pull in updates from puppet-template to fix ci issues