--- a/components/openssh/openssh.p5m	Wed Sep 16 15:58:08 2015 -0700
+++ b/components/openssh/openssh.p5m	Thu Sep 17 20:42:16 2015 -0700
@@ -35,22 +35,22 @@
 set name=org.opensolaris.arc-caseid value=PSARC/2012/335
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 link path=usr/bin/scp target=../lib/openssh/bin/scp mediator=ssh \
-    mediator-implementation=openssh
+    mediator-implementation=openssh mediator-priority=vendor
 link path=usr/bin/sftp target=../lib/openssh/bin/sftp mediator=ssh \
-    mediator-implementation=openssh
+    mediator-implementation=openssh mediator-priority=vendor
 link path=usr/bin/ssh target=../lib/openssh/bin/ssh mediator=ssh \
-    mediator-implementation=openssh
+    mediator-implementation=openssh mediator-priority=vendor
 link path=usr/bin/ssh-add target=../lib/openssh/bin/ssh-add mediator=ssh \
-    mediator-implementation=openssh
+    mediator-implementation=openssh mediator-priority=vendor
 link path=usr/bin/ssh-agent target=../lib/openssh/bin/ssh-agent mediator=ssh \
-    mediator-implementation=openssh
+    mediator-implementation=openssh mediator-priority=vendor
 link path=usr/bin/ssh-keygen target=../lib/openssh/bin/ssh-keygen mediator=ssh \
-    mediator-implementation=openssh
+    mediator-implementation=openssh mediator-priority=vendor
 link path=usr/bin/ssh-keyscan target=../lib/openssh/bin/ssh-keyscan \
-    mediator=ssh mediator-implementation=openssh
+    mediator=ssh mediator-implementation=openssh mediator-priority=vendor
 file usr/lib/dtrace/64/sftp64.d path=usr/lib/dtrace/64/sftp64.d mode=0555
 link path=usr/lib/dtrace/sftp.d target=./64/sftp64.d mediator=ssh \
-    mediator-implementation=openssh
+    mediator-implementation=openssh mediator-priority=vendor
 file usr/bin/scp path=usr/lib/openssh/bin/scp mode=0555
 file usr/bin/sftp path=usr/lib/openssh/bin/sftp mode=0555
 file usr/bin/ssh path=usr/lib/openssh/bin/ssh mode=0555
@@ -64,64 +64,65 @@
     mode=0555
 file usr/lib/ssh/sshd path=usr/lib/openssh/lib/sshd mode=0555
 link path=usr/lib/ssh/sftp-server target=../openssh/lib/sftp-server \
-    mediator=ssh mediator-implementation=openssh
+    mediator=ssh mediator-implementation=openssh mediator-priority=vendor
 link path=usr/lib/ssh/ssh-keysign target=../openssh/lib/ssh-keysign \
-    mediator=ssh mediator-implementation=openssh
+    mediator=ssh mediator-implementation=openssh mediator-priority=vendor
 link path=usr/lib/ssh/ssh-pkcs11-helper \
     target=../openssh/lib/ssh-pkcs11-helper mediator=ssh \
-    mediator-implementation=openssh
+    mediator-implementation=openssh mediator-priority=vendor
 link path=usr/lib/ssh/sshd target=../openssh/lib/sshd mediator=ssh \
-    mediator-implementation=openssh restart_fmri=svc:/network/ssh:default
+    mediator-implementation=openssh mediator-priority=vendor \
+    restart_fmri=svc:/network/ssh:default
 link path=usr/share/man/man1/scp.1 target=./scp.openssh.1 mediator=ssh \
-    mediator-implementation=openssh
+    mediator-implementation=openssh mediator-priority=vendor
 file usr/share/man/man1/scp.1 path=usr/share/man/man1/scp.openssh.1 mode=0444
 link path=usr/share/man/man1/sftp.1 target=./sftp.openssh.1 mediator=ssh \
-    mediator-implementation=openssh
+    mediator-implementation=openssh mediator-priority=vendor
 file usr/share/man/man1/sftp.1 path=usr/share/man/man1/sftp.openssh.1 mode=0444
 link path=usr/share/man/man1/ssh-add.1 target=./ssh-add.openssh.1 mediator=ssh \
-    mediator-implementation=openssh
+    mediator-implementation=openssh mediator-priority=vendor
 file usr/share/man/man1/ssh-add.1 path=usr/share/man/man1/ssh-add.openssh.1 \
     mode=0444
 link path=usr/share/man/man1/ssh-agent.1 target=./ssh-agent.openssh.1 \
-    mediator=ssh mediator-implementation=openssh
+    mediator=ssh mediator-implementation=openssh mediator-priority=vendor
 file usr/share/man/man1/ssh-agent.1 \
     path=usr/share/man/man1/ssh-agent.openssh.1 mode=0444
 link path=usr/share/man/man1/ssh-keygen.1 target=./ssh-keygen.openssh.1 \
-    mediator=ssh mediator-implementation=openssh
+    mediator=ssh mediator-implementation=openssh mediator-priority=vendor
 file usr/share/man/man1/ssh-keygen.1 \
     path=usr/share/man/man1/ssh-keygen.openssh.1 mode=0444
 link path=usr/share/man/man1/ssh-keyscan.1 target=./ssh-keyscan.openssh.1 \
-    mediator=ssh mediator-implementation=openssh
+    mediator=ssh mediator-implementation=openssh mediator-priority=vendor
 file usr/share/man/man1/ssh-keyscan.1 \
     path=usr/share/man/man1/ssh-keyscan.openssh.1 mode=0444
 link path=usr/share/man/man1/ssh.1 target=./ssh.openssh.1 mediator=ssh \
-    mediator-implementation=openssh
+    mediator-implementation=openssh mediator-priority=vendor
 file usr/share/man/man1/ssh.1 path=usr/share/man/man1/ssh.openssh.1 mode=0444
 link path=usr/share/man/man1m/sftp-server.1m target=./sftp-server.openssh.1m \
-    mediator=ssh mediator-implementation=openssh
+    mediator=ssh mediator-implementation=openssh mediator-priority=vendor
 file usr/share/man/man8/sftp-server.8 \
     path=usr/share/man/man1m/sftp-server.openssh.1m
 link path=usr/share/man/man1m/ssh-keysign.1m target=./ssh-keysign.openssh.1m \
-    mediator=ssh mediator-implementation=openssh
+    mediator=ssh mediator-implementation=openssh mediator-priority=vendor
 file usr/share/man/man8/ssh-keysign.8 \
     path=usr/share/man/man1m/ssh-keysign.openssh.1m
 link path=usr/share/man/man1m/ssh-pkcs11-helper.1m \
     target=./ssh-pkcs11-helper.openssh.1m mediator=ssh \
-    mediator-implementation=openssh
+    mediator-implementation=openssh mediator-priority=vendor
 file usr/share/man/man8/ssh-pkcs11-helper.8 \
     path=usr/share/man/man1m/ssh-pkcs11-helper.openssh.1m
 link path=usr/share/man/man1m/sshd.1m target=./sshd.openssh.1m mediator=ssh \
-    mediator-implementation=openssh
+    mediator-implementation=openssh mediator-priority=vendor
 file usr/share/man/man8/sshd.8 path=usr/share/man/man1m/sshd.openssh.1m
 link path=usr/share/man/man4/moduli.4 target=./moduli.openssh.4 mediator=ssh \
-    mediator-implementation=openssh
+    mediator-implementation=openssh mediator-priority=vendor
 file usr/share/man/man5/moduli.5 path=usr/share/man/man4/moduli.openssh.4
 link path=usr/share/man/man4/ssh_config.4 target=./ssh_config.openssh.4 \
-    mediator=ssh mediator-implementation=openssh
+    mediator=ssh mediator-implementation=openssh mediator-priority=vendor
 file usr/share/man/man5/ssh_config.5 \
     path=usr/share/man/man4/ssh_config.openssh.4
 link path=usr/share/man/man4/sshd_config.4 target=./sshd_config.openssh.4 \
-    mediator=ssh mediator-implementation=openssh
+    mediator=ssh mediator-implementation=openssh mediator-priority=vendor
 file usr/share/man/man5/sshd_config.5 \
     path=usr/share/man/man4/sshd_config.openssh.4
 dir  path=var/empty owner=root group=sys mode=0755 sysattr=readonly