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: Iec7e1c83a461c8b018938195312d02b578e67365
Signed-off-by: Takashi Kajinami <kajinamit@oss.nttdata.com>