In anticipation of puppet 4, start trying to deal with puppet 4 things that can be helpfully predicted by puppet lint plugins. Change-Id: I331f3494e136df3fecb7a73f5db4a62b46237240