--- a/components/ruby/puppet-modules/puppetlabs-inifile/puppetlabs-inifile.p5m	Wed Jan 11 15:24:27 2017 -0800
+++ b/components/ruby/puppet-modules/puppetlabs-inifile/puppetlabs-inifile.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-inifile@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
 set name=pkg.summary value="Inifile Puppet Module"
@@ -38,61 +36,62 @@
 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/inifile/CHANGELOG.md
-file path=etc/puppet/modules/inifile/CONTRIBUTING.md
-file path=etc/puppet/modules/inifile/Gemfile
-file path=etc/puppet/modules/inifile/LICENSE
-file path=etc/puppet/modules/inifile/README.markdown
-file path=etc/puppet/modules/inifile/Rakefile
-file path=etc/puppet/modules/inifile/checksums.json
-file path=etc/puppet/modules/inifile/examples/ini_setting.pp
-file path=etc/puppet/modules/inifile/examples/ini_subsetting.pp
-file path=etc/puppet/modules/inifile/lib/puppet/parser/functions/create_ini_settings.rb
-file path=etc/puppet/modules/inifile/lib/puppet/provider/ini_setting/ruby.rb
-file path=etc/puppet/modules/inifile/lib/puppet/provider/ini_subsetting/ruby.rb
-file path=etc/puppet/modules/inifile/lib/puppet/type/ini_setting.rb
-file path=etc/puppet/modules/inifile/lib/puppet/type/ini_subsetting.rb
-file path=etc/puppet/modules/inifile/lib/puppet/util/external_iterator.rb
-file path=etc/puppet/modules/inifile/lib/puppet/util/ini_file.rb
-file path=etc/puppet/modules/inifile/lib/puppet/util/ini_file/section.rb
-file path=etc/puppet/modules/inifile/lib/puppet/util/setting_value.rb
-file path=etc/puppet/modules/inifile/metadata.json
-file path=etc/puppet/modules/inifile/spec/acceptance/ini_setting_spec.rb
-file path=etc/puppet/modules/inifile/spec/acceptance/ini_subsetting_spec.rb
-file path=etc/puppet/modules/inifile/spec/acceptance/nodesets/centos-510-x64.yml
-file path=etc/puppet/modules/inifile/spec/acceptance/nodesets/centos-59-x64.yml
-file path=etc/puppet/modules/inifile/spec/acceptance/nodesets/centos-64-x64-pe.yml
-file path=etc/puppet/modules/inifile/spec/acceptance/nodesets/centos-64-x64.yml
-file path=etc/puppet/modules/inifile/spec/acceptance/nodesets/centos-65-x64.yml
-file path=etc/puppet/modules/inifile/spec/acceptance/nodesets/debian-607-x64.yml
-file path=etc/puppet/modules/inifile/spec/acceptance/nodesets/debian-73-x64.yml
-file path=etc/puppet/modules/inifile/spec/acceptance/nodesets/default.yml
-file path=etc/puppet/modules/inifile/spec/acceptance/nodesets/fedora-18-x64.yml
-file path=etc/puppet/modules/inifile/spec/acceptance/nodesets/sles-11sp1-x64.yml
-file path=etc/puppet/modules/inifile/spec/acceptance/nodesets/ubuntu-server-10044-x64.yml
-file path=etc/puppet/modules/inifile/spec/acceptance/nodesets/ubuntu-server-12042-x64.yml
-file path=etc/puppet/modules/inifile/spec/acceptance/nodesets/ubuntu-server-1404-x64.yml
-file path=etc/puppet/modules/inifile/spec/acceptance/nodesets/windows-2003-i386.yml
-file path=etc/puppet/modules/inifile/spec/acceptance/nodesets/windows-2003r2-x86_64.yml
-file path=etc/puppet/modules/inifile/spec/acceptance/nodesets/windows-2008-x86_64.yml
-file path=etc/puppet/modules/inifile/spec/acceptance/nodesets/windows-2008r2-x86_64.yml
-file path=etc/puppet/modules/inifile/spec/acceptance/nodesets/windows-2012-x86_64.yml
-file path=etc/puppet/modules/inifile/spec/acceptance/nodesets/windows-2012r2-x86_64.yml
-file path=etc/puppet/modules/inifile/spec/classes/create_ini_settings_test_spec.rb
-file path=etc/puppet/modules/inifile/spec/classes/inherit_test1_spec.rb
-file path=etc/puppet/modules/inifile/spec/functions/create_ini_settings_spec.rb
-file path=etc/puppet/modules/inifile/spec/spec.opts
-file path=etc/puppet/modules/inifile/spec/spec_helper.rb
-file path=etc/puppet/modules/inifile/spec/spec_helper_acceptance.rb
-file path=etc/puppet/modules/inifile/spec/unit/puppet/provider/ini_setting/inheritance_spec.rb
-file path=etc/puppet/modules/inifile/spec/unit/puppet/provider/ini_setting/ruby_spec.rb
-file path=etc/puppet/modules/inifile/spec/unit/puppet/provider/ini_subsetting/ruby_spec.rb
-file path=etc/puppet/modules/inifile/spec/unit/puppet/util/external_iterator_spec.rb
-file path=etc/puppet/modules/inifile/spec/unit/puppet/util/ini_file_spec.rb
-file path=etc/puppet/modules/inifile/spec/unit/puppet/util/setting_value_spec.rb
+file path=usr/puppetlabs/puppet/modules/inifile/CHANGELOG.md
+file path=usr/puppetlabs/puppet/modules/inifile/CONTRIBUTING.md
+file path=usr/puppetlabs/puppet/modules/inifile/Gemfile
+file path=usr/puppetlabs/puppet/modules/inifile/LICENSE
+file path=usr/puppetlabs/puppet/modules/inifile/README.markdown
+file path=usr/puppetlabs/puppet/modules/inifile/Rakefile
+file path=usr/puppetlabs/puppet/modules/inifile/checksums.json
+file path=usr/puppetlabs/puppet/modules/inifile/examples/ini_setting.pp
+file path=usr/puppetlabs/puppet/modules/inifile/examples/ini_subsetting.pp
+file path=usr/puppetlabs/puppet/modules/inifile/lib/puppet/parser/functions/create_ini_settings.rb
+file path=usr/puppetlabs/puppet/modules/inifile/lib/puppet/provider/ini_setting/ruby.rb
+file path=usr/puppetlabs/puppet/modules/inifile/lib/puppet/provider/ini_subsetting/ruby.rb
+file path=usr/puppetlabs/puppet/modules/inifile/lib/puppet/type/ini_setting.rb
+file path=usr/puppetlabs/puppet/modules/inifile/lib/puppet/type/ini_subsetting.rb
+file path=usr/puppetlabs/puppet/modules/inifile/lib/puppet/util/external_iterator.rb
+file path=usr/puppetlabs/puppet/modules/inifile/lib/puppet/util/ini_file.rb
+file path=usr/puppetlabs/puppet/modules/inifile/lib/puppet/util/ini_file/section.rb
+file path=usr/puppetlabs/puppet/modules/inifile/lib/puppet/util/setting_value.rb
+file path=usr/puppetlabs/puppet/modules/inifile/metadata.json
+file path=usr/puppetlabs/puppet/modules/inifile/spec/acceptance/ini_setting_spec.rb
+file path=usr/puppetlabs/puppet/modules/inifile/spec/acceptance/ini_subsetting_spec.rb
+file path=usr/puppetlabs/puppet/modules/inifile/spec/acceptance/nodesets/centos-510-x64.yml
+file path=usr/puppetlabs/puppet/modules/inifile/spec/acceptance/nodesets/centos-59-x64.yml
+file path=usr/puppetlabs/puppet/modules/inifile/spec/acceptance/nodesets/centos-64-x64-pe.yml
+file path=usr/puppetlabs/puppet/modules/inifile/spec/acceptance/nodesets/centos-64-x64.yml
+file path=usr/puppetlabs/puppet/modules/inifile/spec/acceptance/nodesets/centos-65-x64.yml
+file path=usr/puppetlabs/puppet/modules/inifile/spec/acceptance/nodesets/debian-607-x64.yml
+file path=usr/puppetlabs/puppet/modules/inifile/spec/acceptance/nodesets/debian-73-x64.yml
+file path=usr/puppetlabs/puppet/modules/inifile/spec/acceptance/nodesets/default.yml
+file path=usr/puppetlabs/puppet/modules/inifile/spec/acceptance/nodesets/fedora-18-x64.yml
+file path=usr/puppetlabs/puppet/modules/inifile/spec/acceptance/nodesets/sles-11sp1-x64.yml
+file path=usr/puppetlabs/puppet/modules/inifile/spec/acceptance/nodesets/ubuntu-server-10044-x64.yml
+file path=usr/puppetlabs/puppet/modules/inifile/spec/acceptance/nodesets/ubuntu-server-12042-x64.yml
+file path=usr/puppetlabs/puppet/modules/inifile/spec/acceptance/nodesets/ubuntu-server-1404-x64.yml
+file path=usr/puppetlabs/puppet/modules/inifile/spec/acceptance/nodesets/windows-2003-i386.yml
+file path=usr/puppetlabs/puppet/modules/inifile/spec/acceptance/nodesets/windows-2003r2-x86_64.yml
+file path=usr/puppetlabs/puppet/modules/inifile/spec/acceptance/nodesets/windows-2008-x86_64.yml
+file path=usr/puppetlabs/puppet/modules/inifile/spec/acceptance/nodesets/windows-2008r2-x86_64.yml
+file path=usr/puppetlabs/puppet/modules/inifile/spec/acceptance/nodesets/windows-2012-x86_64.yml
+file path=usr/puppetlabs/puppet/modules/inifile/spec/acceptance/nodesets/windows-2012r2-x86_64.yml
+file path=usr/puppetlabs/puppet/modules/inifile/spec/classes/create_ini_settings_test_spec.rb
+file path=usr/puppetlabs/puppet/modules/inifile/spec/classes/inherit_test1_spec.rb
+file path=usr/puppetlabs/puppet/modules/inifile/spec/functions/create_ini_settings_spec.rb
+file path=usr/puppetlabs/puppet/modules/inifile/spec/spec.opts
+file path=usr/puppetlabs/puppet/modules/inifile/spec/spec_helper.rb
+file path=usr/puppetlabs/puppet/modules/inifile/spec/spec_helper_acceptance.rb
+file path=usr/puppetlabs/puppet/modules/inifile/spec/unit/puppet/provider/ini_setting/inheritance_spec.rb
+file path=usr/puppetlabs/puppet/modules/inifile/spec/unit/puppet/provider/ini_setting/ruby_spec.rb
+file path=usr/puppetlabs/puppet/modules/inifile/spec/unit/puppet/provider/ini_subsetting/ruby_spec.rb
+file path=usr/puppetlabs/puppet/modules/inifile/spec/unit/puppet/util/external_iterator_spec.rb
+file path=usr/puppetlabs/puppet/modules/inifile/spec/unit/puppet/util/ini_file_spec.rb
+file path=usr/puppetlabs/puppet/modules/inifile/spec/unit/puppet/util/setting_value_spec.rb
 #
 license puppetlabs-inifile.license license="Apache v2.0"
 # Renamed Package