diff -r f958607559a6 -r 48aa82a0931f components/ruby/puppet-modules/puppetlabs-ntp/puppetlabs-ntp.p5m
--- a/components/ruby/puppet-modules/puppetlabs-ntp/puppetlabs-ntp.p5m	Wed Jan 11 15:24:27 2017 -0800
+++ b/components/ruby/puppet-modules/puppetlabs-ntp/puppetlabs-ntp.p5m	Mon Nov 28 16:54:02 2016 -0800
@@ -23,8 +23,6 @@
 # Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
 #
 
-<transform file dir -> default owner puppet>
-<transform file dir -> default group puppet>
 set name=pkg.fmri \
     value=pkg:/system/management/puppet/puppetlabs-ntp@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
 set name=pkg.summary value="NTP Puppet Module"
@@ -38,53 +36,54 @@
 set name=info.upstream \
     value="puppetlabs - https://forge.puppetlabs.com/puppetlabs"
 set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
-set name=org.opensolaris.arc-caseid value=PSARC/2015/368 value=PSARC/2016/016
+set name=org.opensolaris.arc-caseid value=PSARC/2015/368 value=PSARC/2016/016 \
+    value=PSARC/2016/607
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 #
-file path=etc/puppet/modules/ntp/CHANGELOG.md
-file path=etc/puppet/modules/ntp/CONTRIBUTING.md
-file path=etc/puppet/modules/ntp/Gemfile
-file path=etc/puppet/modules/ntp/LICENSE
-file path=etc/puppet/modules/ntp/README.markdown
-file path=etc/puppet/modules/ntp/Rakefile
-file path=etc/puppet/modules/ntp/checksums.json
-file path=etc/puppet/modules/ntp/lib/puppet/parser/functions/ntp_dirname.rb
-file path=etc/puppet/modules/ntp/manifests/config.pp
-file path=etc/puppet/modules/ntp/manifests/init.pp
-file path=etc/puppet/modules/ntp/manifests/install.pp
-file path=etc/puppet/modules/ntp/manifests/params.pp
-file path=etc/puppet/modules/ntp/manifests/service.pp
-file path=etc/puppet/modules/ntp/metadata.json
-file path=etc/puppet/modules/ntp/spec/acceptance/class_spec.rb
-file path=etc/puppet/modules/ntp/spec/acceptance/disable_monitoring_spec.rb
-file path=etc/puppet/modules/ntp/spec/acceptance/nodesets/centos-59-x64.yml
-file path=etc/puppet/modules/ntp/spec/acceptance/nodesets/centos-64-x64-pe.yml
-file path=etc/puppet/modules/ntp/spec/acceptance/nodesets/centos-64-x64.yml
-file path=etc/puppet/modules/ntp/spec/acceptance/nodesets/centos-65-x64.yml
-file path=etc/puppet/modules/ntp/spec/acceptance/nodesets/default.yml
-file path=etc/puppet/modules/ntp/spec/acceptance/nodesets/fedora-18-x64.yml
-file path=etc/puppet/modules/ntp/spec/acceptance/nodesets/fedora-21-x64.yml
-file path=etc/puppet/modules/ntp/spec/acceptance/nodesets/sles-11-x64.yml
-file path=etc/puppet/modules/ntp/spec/acceptance/nodesets/sles-12-64.yml
-file path=etc/puppet/modules/ntp/spec/acceptance/nodesets/ubuntu-server-10044-x64.yml
-file path=etc/puppet/modules/ntp/spec/acceptance/nodesets/ubuntu-server-12042-x64.yml
-file path=etc/puppet/modules/ntp/spec/acceptance/nodesets/ubuntu-server-1404-x64.yml
-file path=etc/puppet/modules/ntp/spec/acceptance/nodesets/ubuntu-server-14042-x64.yml
-file path=etc/puppet/modules/ntp/spec/acceptance/ntp_config_spec.rb
-file path=etc/puppet/modules/ntp/spec/acceptance/ntp_install_spec.rb
-file path=etc/puppet/modules/ntp/spec/acceptance/ntp_parameters_spec.rb
-file path=etc/puppet/modules/ntp/spec/acceptance/ntp_service_spec.rb
-file path=etc/puppet/modules/ntp/spec/acceptance/preferred_servers_spec.rb
-file path=etc/puppet/modules/ntp/spec/acceptance/restrict_spec.rb
-file path=etc/puppet/modules/ntp/spec/acceptance/unsupported_spec.rb
-file path=etc/puppet/modules/ntp/spec/classes/ntp_spec.rb
-file path=etc/puppet/modules/ntp/spec/spec.opts
-file path=etc/puppet/modules/ntp/spec/spec_helper.rb
-file path=etc/puppet/modules/ntp/spec/spec_helper_acceptance.rb
-file path=etc/puppet/modules/ntp/spec/unit/puppet/provider/README.markdown
-file path=etc/puppet/modules/ntp/spec/unit/puppet/type/README.markdown
-file path=etc/puppet/modules/ntp/templates/ntp.conf.erb
-file path=etc/puppet/modules/ntp/tests/init.pp
+file path=usr/puppetlabs/puppet/modules/ntp/CHANGELOG.md
+file path=usr/puppetlabs/puppet/modules/ntp/CONTRIBUTING.md
+file path=usr/puppetlabs/puppet/modules/ntp/Gemfile
+file path=usr/puppetlabs/puppet/modules/ntp/LICENSE
+file path=usr/puppetlabs/puppet/modules/ntp/README.markdown
+file path=usr/puppetlabs/puppet/modules/ntp/Rakefile
+file path=usr/puppetlabs/puppet/modules/ntp/checksums.json
+file path=usr/puppetlabs/puppet/modules/ntp/lib/puppet/parser/functions/ntp_dirname.rb
+file path=usr/puppetlabs/puppet/modules/ntp/manifests/config.pp
+file path=usr/puppetlabs/puppet/modules/ntp/manifests/init.pp
+file path=usr/puppetlabs/puppet/modules/ntp/manifests/install.pp
+file path=usr/puppetlabs/puppet/modules/ntp/manifests/params.pp
+file path=usr/puppetlabs/puppet/modules/ntp/manifests/service.pp
+file path=usr/puppetlabs/puppet/modules/ntp/metadata.json
+file path=usr/puppetlabs/puppet/modules/ntp/spec/acceptance/class_spec.rb
+file path=usr/puppetlabs/puppet/modules/ntp/spec/acceptance/disable_monitoring_spec.rb
+file path=usr/puppetlabs/puppet/modules/ntp/spec/acceptance/nodesets/centos-59-x64.yml
+file path=usr/puppetlabs/puppet/modules/ntp/spec/acceptance/nodesets/centos-64-x64-pe.yml
+file path=usr/puppetlabs/puppet/modules/ntp/spec/acceptance/nodesets/centos-64-x64.yml
+file path=usr/puppetlabs/puppet/modules/ntp/spec/acceptance/nodesets/centos-65-x64.yml
+file path=usr/puppetlabs/puppet/modules/ntp/spec/acceptance/nodesets/default.yml
+file path=usr/puppetlabs/puppet/modules/ntp/spec/acceptance/nodesets/fedora-18-x64.yml
+file path=usr/puppetlabs/puppet/modules/ntp/spec/acceptance/nodesets/fedora-21-x64.yml
+file path=usr/puppetlabs/puppet/modules/ntp/spec/acceptance/nodesets/sles-11-x64.yml
+file path=usr/puppetlabs/puppet/modules/ntp/spec/acceptance/nodesets/sles-12-64.yml
+file path=usr/puppetlabs/puppet/modules/ntp/spec/acceptance/nodesets/ubuntu-server-10044-x64.yml
+file path=usr/puppetlabs/puppet/modules/ntp/spec/acceptance/nodesets/ubuntu-server-12042-x64.yml
+file path=usr/puppetlabs/puppet/modules/ntp/spec/acceptance/nodesets/ubuntu-server-1404-x64.yml
+file path=usr/puppetlabs/puppet/modules/ntp/spec/acceptance/nodesets/ubuntu-server-14042-x64.yml
+file path=usr/puppetlabs/puppet/modules/ntp/spec/acceptance/ntp_config_spec.rb
+file path=usr/puppetlabs/puppet/modules/ntp/spec/acceptance/ntp_install_spec.rb
+file path=usr/puppetlabs/puppet/modules/ntp/spec/acceptance/ntp_parameters_spec.rb
+file path=usr/puppetlabs/puppet/modules/ntp/spec/acceptance/ntp_service_spec.rb
+file path=usr/puppetlabs/puppet/modules/ntp/spec/acceptance/preferred_servers_spec.rb
+file path=usr/puppetlabs/puppet/modules/ntp/spec/acceptance/restrict_spec.rb
+file path=usr/puppetlabs/puppet/modules/ntp/spec/acceptance/unsupported_spec.rb
+file path=usr/puppetlabs/puppet/modules/ntp/spec/classes/ntp_spec.rb
+file path=usr/puppetlabs/puppet/modules/ntp/spec/spec.opts
+file path=usr/puppetlabs/puppet/modules/ntp/spec/spec_helper.rb
+file path=usr/puppetlabs/puppet/modules/ntp/spec/spec_helper_acceptance.rb
+file path=usr/puppetlabs/puppet/modules/ntp/spec/unit/puppet/provider/README.markdown
+file path=usr/puppetlabs/puppet/modules/ntp/spec/unit/puppet/type/README.markdown
+file path=usr/puppetlabs/puppet/modules/ntp/templates/ntp.conf.erb
+file path=usr/puppetlabs/puppet/modules/ntp/tests/init.pp
 #
 license puppetlabs-ntp.license license="Apache v2.0"
 # Renamed Package