[1336653] Changes to support multiple puppet modules and manifests version