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