diff -r 0ca3f3d6c919 -r 5bd484384122 components/python/heatclient/heatclient-PYVER.p5m
--- a/components/python/heatclient/heatclient-PYVER.p5m	Fri Mar 20 03:13:26 2015 -0700
+++ b/components/python/heatclient/heatclient-PYVER.p5m	Thu Mar 19 14:41:20 2015 -0700
@@ -20,13 +20,13 @@
 #
 
 #
-# Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
 #
 
 set name=pkg.fmri \
     value=pkg:/library/python/heatclient-$(PYV)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
 set name=pkg.summary \
-    value="Python and command-line clients for the OpenStack Heat API"
+    value="Python and command-line clients for the OpenStack Orchestration API"
 set name=pkg.description \
     value="A client for the OpenStack Orchestration API. There's a Python API (the 'heatclient' module), and a command-line script ('heat'). Each implements 100% of the OpenStack Orchestration API."
 set name=com.oracle.info.description \
@@ -41,6 +41,7 @@
 set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
 set name=org.opensolaris.arc-caseid value=PSARC/2014/163
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+#
 link path=usr/bin/heat target=heat-$(PYVER) mediator=python \
     mediator-version=$(PYVER)
 file path=usr/bin/heat-$(PYVER)
@@ -56,8 +57,11 @@
 file path=usr/lib/python$(PYVER)/vendor-packages/heatclient/openstack/__init__.py
 file path=usr/lib/python$(PYVER)/vendor-packages/heatclient/openstack/common/__init__.py
 file path=usr/lib/python$(PYVER)/vendor-packages/heatclient/openstack/common/apiclient/__init__.py
+file path=usr/lib/python$(PYVER)/vendor-packages/heatclient/openstack/common/apiclient/auth.py
 file path=usr/lib/python$(PYVER)/vendor-packages/heatclient/openstack/common/apiclient/base.py
+file path=usr/lib/python$(PYVER)/vendor-packages/heatclient/openstack/common/apiclient/client.py
 file path=usr/lib/python$(PYVER)/vendor-packages/heatclient/openstack/common/apiclient/exceptions.py
+file path=usr/lib/python$(PYVER)/vendor-packages/heatclient/openstack/common/apiclient/fake_client.py
 file path=usr/lib/python$(PYVER)/vendor-packages/heatclient/openstack/common/cliutils.py
 file path=usr/lib/python$(PYVER)/vendor-packages/heatclient/openstack/common/gettextutils.py
 file path=usr/lib/python$(PYVER)/vendor-packages/heatclient/openstack/common/importutils.py
@@ -84,12 +88,17 @@
 file path=usr/lib/python$(PYVER)/vendor-packages/python_heatclient-$(COMPONENT_VERSION)-py$(PYVER).egg-info/not-zip-safe
 file path=usr/lib/python$(PYVER)/vendor-packages/python_heatclient-$(COMPONENT_VERSION)-py$(PYVER).egg-info/requires.txt
 file path=usr/lib/python$(PYVER)/vendor-packages/python_heatclient-$(COMPONENT_VERSION)-py$(PYVER).egg-info/top_level.txt
+#
 license LICENSE license="Apache v2.0"
 
 # force a group dependency on the optional anyjson; pkgdepend work is needed to
 # flush this out.
 depend type=group fmri=library/python/anyjson-$(PYV)
 
+# force a group dependency on the optional simplejson; pkgdepend work is needed
+# to flush this out.
+depend type=group fmri=library/python/simplejson-$(PYV)
+
 # force a dependency on argparse; pkgdepend work is needed to flush this out.
 depend type=require fmri=library/python/argparse-$(PYV)
 
@@ -103,7 +112,8 @@
 # force a dependency on iso8601; pkgdepend work is needed to flush this out.
 depend type=require fmri=library/python/iso8601-$(PYV)
 
-# force a dependency on keystoneclient; pkgdepend work is needed to flush this out.
+# force a dependency on keystoneclient; pkgdepend work is needed to flush this
+# out.
 depend type=require fmri=library/python/keystoneclient-$(PYV)
 
 # force a dependency on pbr; pkgdepend work is needed to flush this out.
@@ -120,3 +130,6 @@
 
 # force a dependency on six; pkgdepend work is needed to flush this out.
 depend type=require fmri=library/python/six-$(PYV)
+
+# force a dependency on stevedore; pkgdepend work is needed to flush this out.
+depend type=require fmri=library/python/stevedore-$(PYV)