diff -r 7b09b73a67a4 -r 0f62cc221c7e components/mysql-common/mysql-common.p5m
--- a/components/mysql-common/mysql-common.p5m	Fri Jan 23 17:31:40 2015 -0800
+++ b/components/mysql-common/mysql-common.p5m	Tue Feb 03 19:24:25 2015 -0800
@@ -18,10 +18,11 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
 #
 
-set name=pkg.fmri value=pkg:/database/mysql-common@$(COMPONENT_VERSION),$(BUILD_VERSION)
+set name=pkg.fmri \
+    value=pkg:/database/mysql-common@$(COMPONENT_VERSION),$(BUILD_VERSION)
 set name=pkg.summary value="MySQL Database Management System (Base)"
 set name=info.classification \
     value=org.opensolaris.category.2008:Development/Databases
@@ -29,18 +30,16 @@
 set name=org.opensolaris.arc-caseid value=PSARC/2013/333
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 
-license mysql.license license=Oracle
-
-# mysql user account and group setup
-group groupname=mysql gid=70
-
-user username=mysql ftpuser=false gcos-field="MySQL Reserved UID" group=mysql \
-    password=NP uid=70
-
-# optionally depend on mysql-51 to bring it forward if already installed
-depend fmri=database/mysql-51@5.1.37,5.12-5.12.0.0.0.35.0 type=optional
-
 # mysql common SMF config
 file Solaris/mysql-auth path=etc/security/auth_attr.d/mysql
 file Solaris/mysql-prof path=etc/security/prof_attr.d/mysql
 
+# mysql user account and group setup
+group groupname=mysql gid=70
+user username=mysql ftpuser=false gcos-field="MySQL Reserved UID" group=mysql \
+    password=NP uid=70
+license mysql.license license=Oracle
+
+# optionally depend on mysql-51 to bring it forward if already installed
+depend type=optional fmri=database/mysql-51@5.1.37,5.12-5.12.0.0.0.35.0
+