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