In anticipation of puppet 4, start trying to deal with puppet 4 things
that can be helpfully predicted by puppet lint plugins. Also fix arrow
alignment errors caught by the bundle-installed puppet-lint.
Change-Id: I060c65c6ca9292216620a851d402359c33ca9927
Colleen Murphy