Replace deprecated Modulefile with metadata.json
Minor changes after running puppet-lint