--- a/components/ruby/puppet-modules/openstack-heat/openstack-heat.p5m	Wed Jan 11 15:24:27 2017 -0800
+++ b/components/ruby/puppet-modules/openstack-heat/openstack-heat.p5m	Mon Nov 28 16:54:02 2016 -0800
@@ -35,87 +35,87 @@
     value="org.opensolaris.category.2008:System/Enterprise Management"
 set name=info.upstream value="OpenStack <[email protected]>"
 set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
-set name=org.opensolaris.arc-caseid value=PSARC/2016/001
+set name=org.opensolaris.arc-caseid value=PSARC/2016/001 value=PSARC/2016/607
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 #
-file path=etc/puppet/modules/heat/CHANGELOG.md
-file path=etc/puppet/modules/heat/Gemfile
-file path=etc/puppet/modules/heat/LICENSE
-file path=etc/puppet/modules/heat/README.md
-file path=etc/puppet/modules/heat/Rakefile
-file path=etc/puppet/modules/heat/checksums.json
-file path=etc/puppet/modules/heat/examples/site.pp
-file path=etc/puppet/modules/heat/lib/puppet/provider/heat_api_paste_ini/ini_setting.rb
-file path=etc/puppet/modules/heat/lib/puppet/provider/heat_config/ini_setting.rb
-file path=etc/puppet/modules/heat/lib/puppet/type/heat_api_paste_ini.rb
-file path=etc/puppet/modules/heat/lib/puppet/type/heat_config.rb
-file path=etc/puppet/modules/heat/manifests/api.pp
-file path=etc/puppet/modules/heat/manifests/api_cfn.pp
-file path=etc/puppet/modules/heat/manifests/api_cloudwatch.pp
-file path=etc/puppet/modules/heat/manifests/client.pp
-file path=etc/puppet/modules/heat/manifests/config.pp
-file path=etc/puppet/modules/heat/manifests/cron/purge_deleted.pp
-file path=etc/puppet/modules/heat/manifests/db.pp
-file path=etc/puppet/modules/heat/manifests/db/mysql.pp
-file path=etc/puppet/modules/heat/manifests/db/postgresql.pp
-file path=etc/puppet/modules/heat/manifests/db/sync.pp
-file path=etc/puppet/modules/heat/manifests/deps.pp
-file path=etc/puppet/modules/heat/manifests/engine.pp
-file path=etc/puppet/modules/heat/manifests/init.pp
-file path=etc/puppet/modules/heat/manifests/keystone/auth.pp
-file path=etc/puppet/modules/heat/manifests/keystone/auth_cfn.pp
-file path=etc/puppet/modules/heat/manifests/keystone/domain.pp
-file path=etc/puppet/modules/heat/manifests/logging.pp
-file path=etc/puppet/modules/heat/manifests/params.pp
-file path=etc/puppet/modules/heat/manifests/policy.pp
-file path=etc/puppet/modules/heat/metadata.json
-file path=etc/puppet/modules/heat/releasenotes/notes/api_paste-b94e191896840944.yaml
-file path=etc/puppet/modules/heat/releasenotes/notes/crontab_purge-89f321e9cf966933.yaml
-file path=etc/puppet/modules/heat/releasenotes/notes/mitaka-dece9d43a565e6cb.yaml
-file path=etc/puppet/modules/heat/releasenotes/notes/pymysql-e57bf1f0289dd426.yaml
-file path=etc/puppet/modules/heat/releasenotes/notes/remove_qpid-0b446db43fdea617.yaml
-file path=etc/puppet/modules/heat/releasenotes/notes/use-reno-1caaec4ba5aa4285.yaml
-file path=etc/puppet/modules/heat/releasenotes/notes/versionless-auth-urls-08c741084b9a9040.yaml
-file path=etc/puppet/modules/heat/releasenotes/source/_static/.placeholder
-file path=etc/puppet/modules/heat/releasenotes/source/conf.py
-file path=etc/puppet/modules/heat/releasenotes/source/index.rst
-file path=etc/puppet/modules/heat/releasenotes/source/mitaka.rst
-file path=etc/puppet/modules/heat/releasenotes/source/unreleased.rst
-file path=etc/puppet/modules/heat/setup.cfg
-file path=etc/puppet/modules/heat/setup.py
-file path=etc/puppet/modules/heat/spec/acceptance/basic_heat_spec.rb
-file path=etc/puppet/modules/heat/spec/acceptance/nodesets/centos-70-x64.yml
-file path=etc/puppet/modules/heat/spec/acceptance/nodesets/default.yml
-file path=etc/puppet/modules/heat/spec/acceptance/nodesets/nodepool-centos7.yml
-file path=etc/puppet/modules/heat/spec/acceptance/nodesets/nodepool-trusty.yml
-file path=etc/puppet/modules/heat/spec/acceptance/nodesets/ubuntu-server-1404-x64.yml
-file path=etc/puppet/modules/heat/spec/classes/heat_api_cfn_spec.rb
-file path=etc/puppet/modules/heat/spec/classes/heat_api_cloudwatch_spec.rb
-file path=etc/puppet/modules/heat/spec/classes/heat_api_spec.rb
-file path=etc/puppet/modules/heat/spec/classes/heat_client_spec.rb
-file path=etc/puppet/modules/heat/spec/classes/heat_config_spec.rb
-file path=etc/puppet/modules/heat/spec/classes/heat_cron_purge_deleted_spec.rb
-file path=etc/puppet/modules/heat/spec/classes/heat_db_mysql_spec.rb
-file path=etc/puppet/modules/heat/spec/classes/heat_db_postgresql_spec.rb
-file path=etc/puppet/modules/heat/spec/classes/heat_db_spec.rb
-file path=etc/puppet/modules/heat/spec/classes/heat_db_sync_spec.rb
-file path=etc/puppet/modules/heat/spec/classes/heat_deps_spec.rb
-file path=etc/puppet/modules/heat/spec/classes/heat_engine_spec.rb
-file path=etc/puppet/modules/heat/spec/classes/heat_init_spec.rb
-file path=etc/puppet/modules/heat/spec/classes/heat_keystone_auth_cfn_spec.rb
-file path=etc/puppet/modules/heat/spec/classes/heat_keystone_auth_spec.rb
-file path=etc/puppet/modules/heat/spec/classes/heat_keystone_domain_spec.rb
-file path=etc/puppet/modules/heat/spec/classes/heat_logging_spec.rb
-file path=etc/puppet/modules/heat/spec/classes/heat_policy_spec.rb
-file path=etc/puppet/modules/heat/spec/shared_examples.rb
-file path=etc/puppet/modules/heat/spec/spec_helper.rb
-file path=etc/puppet/modules/heat/spec/spec_helper_acceptance.rb
-file path=etc/puppet/modules/heat/spec/unit/provider/heat_api_paste_ini/ini_setting_spec.rb
-file path=etc/puppet/modules/heat/spec/unit/provider/heat_config/ini_setting_spec.rb
-file path=etc/puppet/modules/heat/spec/unit/type/heat_api_paste_ini_spec.rb
-file path=etc/puppet/modules/heat/spec/unit/type/heat_config_spec.rb
-file path=etc/puppet/modules/heat/test-requirements.txt
-file path=etc/puppet/modules/heat/tox.ini
+file path=usr/puppetlabs/puppet/modules/heat/CHANGELOG.md
+file path=usr/puppetlabs/puppet/modules/heat/Gemfile
+file path=usr/puppetlabs/puppet/modules/heat/LICENSE
+file path=usr/puppetlabs/puppet/modules/heat/README.md
+file path=usr/puppetlabs/puppet/modules/heat/Rakefile
+file path=usr/puppetlabs/puppet/modules/heat/checksums.json
+file path=usr/puppetlabs/puppet/modules/heat/examples/site.pp
+file path=usr/puppetlabs/puppet/modules/heat/lib/puppet/provider/heat_api_paste_ini/ini_setting.rb
+file path=usr/puppetlabs/puppet/modules/heat/lib/puppet/provider/heat_config/ini_setting.rb
+file path=usr/puppetlabs/puppet/modules/heat/lib/puppet/type/heat_api_paste_ini.rb
+file path=usr/puppetlabs/puppet/modules/heat/lib/puppet/type/heat_config.rb
+file path=usr/puppetlabs/puppet/modules/heat/manifests/api.pp
+file path=usr/puppetlabs/puppet/modules/heat/manifests/api_cfn.pp
+file path=usr/puppetlabs/puppet/modules/heat/manifests/api_cloudwatch.pp
+file path=usr/puppetlabs/puppet/modules/heat/manifests/client.pp
+file path=usr/puppetlabs/puppet/modules/heat/manifests/config.pp
+file path=usr/puppetlabs/puppet/modules/heat/manifests/cron/purge_deleted.pp
+file path=usr/puppetlabs/puppet/modules/heat/manifests/db.pp
+file path=usr/puppetlabs/puppet/modules/heat/manifests/db/mysql.pp
+file path=usr/puppetlabs/puppet/modules/heat/manifests/db/postgresql.pp
+file path=usr/puppetlabs/puppet/modules/heat/manifests/db/sync.pp
+file path=usr/puppetlabs/puppet/modules/heat/manifests/deps.pp
+file path=usr/puppetlabs/puppet/modules/heat/manifests/engine.pp
+file path=usr/puppetlabs/puppet/modules/heat/manifests/init.pp
+file path=usr/puppetlabs/puppet/modules/heat/manifests/keystone/auth.pp
+file path=usr/puppetlabs/puppet/modules/heat/manifests/keystone/auth_cfn.pp
+file path=usr/puppetlabs/puppet/modules/heat/manifests/keystone/domain.pp
+file path=usr/puppetlabs/puppet/modules/heat/manifests/logging.pp
+file path=usr/puppetlabs/puppet/modules/heat/manifests/params.pp
+file path=usr/puppetlabs/puppet/modules/heat/manifests/policy.pp
+file path=usr/puppetlabs/puppet/modules/heat/metadata.json
+file path=usr/puppetlabs/puppet/modules/heat/releasenotes/notes/api_paste-b94e191896840944.yaml
+file path=usr/puppetlabs/puppet/modules/heat/releasenotes/notes/crontab_purge-89f321e9cf966933.yaml
+file path=usr/puppetlabs/puppet/modules/heat/releasenotes/notes/mitaka-dece9d43a565e6cb.yaml
+file path=usr/puppetlabs/puppet/modules/heat/releasenotes/notes/pymysql-e57bf1f0289dd426.yaml
+file path=usr/puppetlabs/puppet/modules/heat/releasenotes/notes/remove_qpid-0b446db43fdea617.yaml
+file path=usr/puppetlabs/puppet/modules/heat/releasenotes/notes/use-reno-1caaec4ba5aa4285.yaml
+file path=usr/puppetlabs/puppet/modules/heat/releasenotes/notes/versionless-auth-urls-08c741084b9a9040.yaml
+file path=usr/puppetlabs/puppet/modules/heat/releasenotes/source/_static/.placeholder
+file path=usr/puppetlabs/puppet/modules/heat/releasenotes/source/conf.py
+file path=usr/puppetlabs/puppet/modules/heat/releasenotes/source/index.rst
+file path=usr/puppetlabs/puppet/modules/heat/releasenotes/source/mitaka.rst
+file path=usr/puppetlabs/puppet/modules/heat/releasenotes/source/unreleased.rst
+file path=usr/puppetlabs/puppet/modules/heat/setup.cfg
+file path=usr/puppetlabs/puppet/modules/heat/setup.py
+file path=usr/puppetlabs/puppet/modules/heat/spec/acceptance/basic_heat_spec.rb
+file path=usr/puppetlabs/puppet/modules/heat/spec/acceptance/nodesets/centos-70-x64.yml
+file path=usr/puppetlabs/puppet/modules/heat/spec/acceptance/nodesets/default.yml
+file path=usr/puppetlabs/puppet/modules/heat/spec/acceptance/nodesets/nodepool-centos7.yml
+file path=usr/puppetlabs/puppet/modules/heat/spec/acceptance/nodesets/nodepool-trusty.yml
+file path=usr/puppetlabs/puppet/modules/heat/spec/acceptance/nodesets/ubuntu-server-1404-x64.yml
+file path=usr/puppetlabs/puppet/modules/heat/spec/classes/heat_api_cfn_spec.rb
+file path=usr/puppetlabs/puppet/modules/heat/spec/classes/heat_api_cloudwatch_spec.rb
+file path=usr/puppetlabs/puppet/modules/heat/spec/classes/heat_api_spec.rb
+file path=usr/puppetlabs/puppet/modules/heat/spec/classes/heat_client_spec.rb
+file path=usr/puppetlabs/puppet/modules/heat/spec/classes/heat_config_spec.rb
+file path=usr/puppetlabs/puppet/modules/heat/spec/classes/heat_cron_purge_deleted_spec.rb
+file path=usr/puppetlabs/puppet/modules/heat/spec/classes/heat_db_mysql_spec.rb
+file path=usr/puppetlabs/puppet/modules/heat/spec/classes/heat_db_postgresql_spec.rb
+file path=usr/puppetlabs/puppet/modules/heat/spec/classes/heat_db_spec.rb
+file path=usr/puppetlabs/puppet/modules/heat/spec/classes/heat_db_sync_spec.rb
+file path=usr/puppetlabs/puppet/modules/heat/spec/classes/heat_deps_spec.rb
+file path=usr/puppetlabs/puppet/modules/heat/spec/classes/heat_engine_spec.rb
+file path=usr/puppetlabs/puppet/modules/heat/spec/classes/heat_init_spec.rb
+file path=usr/puppetlabs/puppet/modules/heat/spec/classes/heat_keystone_auth_cfn_spec.rb
+file path=usr/puppetlabs/puppet/modules/heat/spec/classes/heat_keystone_auth_spec.rb
+file path=usr/puppetlabs/puppet/modules/heat/spec/classes/heat_keystone_domain_spec.rb
+file path=usr/puppetlabs/puppet/modules/heat/spec/classes/heat_logging_spec.rb
+file path=usr/puppetlabs/puppet/modules/heat/spec/classes/heat_policy_spec.rb
+file path=usr/puppetlabs/puppet/modules/heat/spec/shared_examples.rb
+file path=usr/puppetlabs/puppet/modules/heat/spec/spec_helper.rb
+file path=usr/puppetlabs/puppet/modules/heat/spec/spec_helper_acceptance.rb
+file path=usr/puppetlabs/puppet/modules/heat/spec/unit/provider/heat_api_paste_ini/ini_setting_spec.rb
+file path=usr/puppetlabs/puppet/modules/heat/spec/unit/provider/heat_config/ini_setting_spec.rb
+file path=usr/puppetlabs/puppet/modules/heat/spec/unit/type/heat_api_paste_ini_spec.rb
+file path=usr/puppetlabs/puppet/modules/heat/spec/unit/type/heat_config_spec.rb
+file path=usr/puppetlabs/puppet/modules/heat/test-requirements.txt
+file path=usr/puppetlabs/puppet/modules/heat/tox.ini
 #
 license openstack-heat.license license="Apache v2.0"