Fix Puppet 3.2.x deprecation warnings

Change-Id: I4f6075fb189474ee071fa9b80944a5fe5c062193