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