Update some deprecated Puppet variable references

While getting these scripts to run on Puppet 3 with Fedora 20, I got
a series of warnings about the deprecation of variable names. These
changes should also continue to work fine on Puppet 2.7.

Change-Id: I232f5f5a9abbe94be9fe2d3b8c82f009c03a11f3
Merge "Update some deprecated Puppet variable references"