Clean up style

Fix puppet-lint violations as a step toward running puppet-lint
at the gate.

Change-Id: I97d9ab7e5f3b009987d7d3e20fb8b5db68fea825
Merge "Clean up style"