Migrate to Puppet 4.X functions

We got an automated merge request from a Puppetlabs script that kinda migrated from Puppet 3.x to Puppet 4.x functions for us.

I did the extra manual work needed to complete the migration.

More on the Puppet 3.x -> 4.x function migration here.

I don't actually use those two functions in prod so it's hard to me to test this, but the CI tests are passing so I must have done something right :)