This fixes a few lint warnings/errors detected by the following plugins
we aim to enable soon.
- puppet-lint-file_ensure-check
- puppet-lint-trailing_comma-check
- puppet-lint-topscope-variable-check
Change-Id: I42a03325dec65273cf885a780343ed2929fe4230
Signed-off-by: Takashi Kajinami <kajinamit@oss.nttdata.com>