merge with onnv_147
Reviewed by: garrett@nexenta.com
Approved by: garrett@nexenta.com

6974613 manifest-import can be restructured to allow importing to alternate repository
6974718 svccfg core dump after upgrading to snv_145

6945131 SMF should support multiple administrative profiles
6945268 awk syntax error in /lib/svc/method/manifest-import
6945638 broken /var/svc/profile/platform.xml after upgrade to 137

PSARC 2010/013 SMF Early Manifest Import
6503835 manifest-import should be done earlier in boot