--- a/components/openstack/common/tempest-preinstall.p5m	Fri Mar 20 17:42:24 2015 -0600
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,42 +0,0 @@
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License (the "License").
-# You may not use this file except in compliance with the License.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-
-#
-# Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
-#
-
-set name=pkg.fmri \
-    value=pkg:/group/prerequisite/openstack/[email protected],$(BUILD_VERSION)
-set name=pkg.summary value="Prerequisite package for OpenStack Tempest"
-set name=info.classification \
-    value="org.opensolaris.category.2008:Meta Packages/Group Packages"
-set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
-depend type=require fmri=cloud/openstack
-depend type=require fmri=developer/versioning/git
-depend type=require fmri=library/python/discover-26
-depend type=require fmri=library/python/fixtures-26
-depend type=require fmri=library/python/keyring-26
-depend type=require fmri=library/python/nose-26
-depend type=require fmri=library/python/paramiko-26
-depend type=require fmri=library/python/testrepository-26
-depend type=require fmri=library/python/testresources-26
-depend type=require fmri=library/python/testscenarios-26
-depend type=require fmri=library/python/testtools-26

--- a/components/openstack/horizon/horizon.p5m	Fri Mar 20 17:42:24 2015 -0600
+++ b/components/openstack/horizon/horizon.p5m	Sat Mar 21 11:00:35 2015 -0600
@@ -2009,7 +2009,7 @@
 license bootstrap-scss.license license="MIT (Bootstrap-SCSS)" \
     com.oracle.info.description="Bootstrap SCSS JavaScript Library" \
     com.oracle.info.name=$(COMPONENT_NAME) \
-    com.oracle.info.tpno=$(TPNO_BOOTSTRP_SCSS) \
+    com.oracle.info.tpno=$(TPNO_BOOTSTRAP_SCSS) \
     com.oracle.info.version=$(VERSION_BOOTSTRAP_SCSS)
 license angular.license license="MIT (angularjs)" \
     com.oracle.info.description="AngularJS JavaScript Library" \