Fix deprecation warnings

Fix wording to be consistent across all Puppet modules.

Change-Id: I4bd88e9a57d4ccc5848f07fadbe17116d316bca8
Merge "Fix deprecation warnings"