Fixes for `puppet-lint` warnings/errors

See the commit message for the full list of fixes. The errors about `two-space soft tabs not used` is because of the odd number of spaces in front of the array declaration lines.