[illumos-gate merge]

commit 22cc5444cba0d30b59582f255e2eb24e8a702824
    7821 loader: need to parse unescaped bootpath in /boot/solaris/bootenv.rc
commit be4e997e05c92f444c81d2d197b79e67ebee2786
    7717 Update prototypes to 2017
commit a317d5f60cbb8b31bf3341744d7d938e7218e552
    7806 svccfg restore segfaults in upgrade_manifestfiles
commit e2004245d6147c5747ca68584835573d99d469d9
    7436 webrev doesn't work if illumos-gate is a submodule

	Conflicts:
	usr/src/uts/common/inet/tcp/tcp_opt_data.c

15 files changed, 30 insertions, 26 deletions

diff --git a/usr/src/boot/sys/boot/forth/support.4th b/usr/src/boot/sys/boot/forth/support.4th
index 16b8a88846..7707102deb 100644
--- a/usr/src/boot/sys/boot/forth/support.4th
+++ b/usr/src/boot/sys/boot/forth/support.4th
@@ -21,8 +21,6 @@
 \ LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
 \ OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 \ SUCH DAMAGE.
-\
-\ $FreeBSD$
 
 \ Loader.rc support functions:
 \
@@ -512,6 +510,12 @@ also parser definitions
 
 : comma?  line_pointer c@ [char] , = ;
 
+: at?  line_pointer c@ [char] @ = ;
+
+: slash?  line_pointer c@ [char] / = ;
+
+: colon?  line_pointer c@ [char] : = ;
+
 \ manipulation of input line
 : skip_character line_pointer char+ to line_pointer ;
 
@@ -543,8 +547,8 @@ also parser definitions
   line_pointer
   begin
     end_of_line? if 0 else
-      letter? digit? underscore? dot? comma? dash?
-      or or or or or
+      letter? digit? underscore? dot? comma? dash? at? slash? colon?
+      or or or or or or or or
     then
   while
     skip_character
@@ -625,7 +629,7 @@ also parser definitions
 
 : white_space_3
   eat_space
-  letter? digit? "quote? 'quote? or or or if
+  slash? letter? digit? "quote? 'quote? or or or or if
     ['] variable_value to parsing_function exit
   then
   ESYNTAX throw
diff --git a/usr/src/cmd/svc/svccfg/svccfg_libscf.c b/usr/src/cmd/svc/svccfg/svccfg_libscf.c
index bc3191ac88..ab657d69a0 100644
--- a/usr/src/cmd/svc/svccfg/svccfg_libscf.c
+++ b/usr/src/cmd/svc/svccfg/svccfg_libscf.c
@@ -23,6 +23,7 @@
  * Copyright (c) 2004, 2010, Oracle and/or its affiliates. All rights reserved.
  * Copyright 2015 Joyent, Inc.
  * Copyright 2012 Milan Jurik. All rights reserved.
+ * Copyright 2017 RackTop Systems.
  */
 
 
@@ -3895,7 +3896,7 @@ commit:
  *
  */
 static int
-upgrade_manifestfiles(pgroup_t *pg, const entity_t *ient,
+upgrade_manifestfiles(pgroup_t *pg, entity_t *ient,
     const scf_snaplevel_t *running, void *ent)
 {
 	scf_propertygroup_t *ud_mfsts_pg = NULL;
@@ -3965,13 +3966,9 @@ upgrade_manifestfiles(pgroup_t *pg, const entity_t *ient,
 	}
 
 	/* Fetch the new manifests property group */
-	for (mfst_pgroup = uu_list_first(ient->sc_pgroups);
-	    mfst_pgroup != NULL;
-	    mfst_pgroup = uu_list_next(ient->sc_pgroups, mfst_pgroup)) {
-		if (strcmp(mfst_pgroup->sc_pgroup_name,
-		    SCF_PG_MANIFESTFILES) == 0)
-			break;
-	}
+	mfst_pgroup = internal_pgroup_find_or_create(ient,
+	    SCF_PG_MANIFESTFILES, SCF_GROUP_FRAMEWORK);
+	assert(mfst_pgroup != NULL);
 
 	if ((r = scf_iter_pg_properties(ud_prop_iter, ud_mfsts_pg)) !=
 	    SCF_SUCCESS)
diff --git a/usr/src/prototypes/prototype.Makefile b/usr/src/prototypes/prototype.Makefile
index c128af316e..f0d7b4e999 100644
--- a/usr/src/prototypes/prototype.Makefile
+++ b/usr/src/prototypes/prototype.Makefile
@@ -10,6 +10,6 @@
 #
 
 #
-# Copyright 2016 <contributor>
+# Copyright 2017 <contributor>
 #
 
diff --git a/usr/src/prototypes/prototype.c b/usr/src/prototypes/prototype.c
index 04cc383267..536ac9c88f 100644
--- a/usr/src/prototypes/prototype.c
+++ b/usr/src/prototypes/prototype.c
@@ -10,7 +10,7 @@
  */
 
 /*
- * Copyright 2016 <contributor>
+ * Copyright 2017 <contributor>
  */
 
 /*
diff --git a/usr/src/prototypes/prototype.csh b/usr/src/prototypes/prototype.csh
index e5e9bbdab6..e0f74349a0 100644
--- a/usr/src/prototypes/prototype.csh
+++ b/usr/src/prototypes/prototype.csh
@@ -12,6 +12,6 @@
 #
 
 #
-# Copyright 2016 <contributor>
+# Copyright 2017 <contributor>
 #
 
diff --git a/usr/src/prototypes/prototype.h b/usr/src/prototypes/prototype.h
index 490f41d5e8..6bfe292f94 100644
--- a/usr/src/prototypes/prototype.h
+++ b/usr/src/prototypes/prototype.h
@@ -10,7 +10,7 @@
  */
 
 /*
- * Copyright 2016 <contributor>
+ * Copyright 2017 <contributor>
  */
 
 #ifndef _PROTOTYPE_H
diff --git a/usr/src/prototypes/prototype.java b/usr/src/prototypes/prototype.java
index 5035f7b4b3..b01241c34d 100644
--- a/usr/src/prototypes/prototype.java
+++ b/usr/src/prototypes/prototype.java
@@ -10,7 +10,7 @@
  */
 
 /*
- * Copyright 2016 <contributor>
+ * Copyright 2017 <contributor>
  */
 
 /*
diff --git a/usr/src/prototypes/prototype.ksh b/usr/src/prototypes/prototype.ksh
index 3598a8cfa0..557e893454 100644
--- a/usr/src/prototypes/prototype.ksh
+++ b/usr/src/prototypes/prototype.ksh
@@ -12,6 +12,6 @@
 #
 
 #
-# Copyright 2016 <contributor>
+# Copyright 2017 <contributor>
 #
 
diff --git a/usr/src/prototypes/prototype.man b/usr/src/prototypes/prototype.man
index d1b37a4d2a..c397b1a824 100644
--- a/usr/src/prototypes/prototype.man
+++ b/usr/src/prototypes/prototype.man
@@ -9,5 +9,5 @@
 .\" http://www.illumos.org/license/CDDL.
 .\"
 .\"
-.\" Copyright 2016 <contributor>
+.\" Copyright 2017 <contributor>
 .\"
diff --git a/usr/src/prototypes/prototype.mapfile-vers b/usr/src/prototypes/prototype.mapfile-vers
index 2f9faf35ec..24047a265d 100644
--- a/usr/src/prototypes/prototype.mapfile-vers
+++ b/usr/src/prototypes/prototype.mapfile-vers
@@ -10,7 +10,7 @@
 #
 
 #
-# Copyright 2016 <contributor>
+# Copyright 2017 <contributor>
 #
 
 #
diff --git a/usr/src/prototypes/prototype.pl b/usr/src/prototypes/prototype.pl
index 79f73dc897..57f6035bd5 100644
--- a/usr/src/prototypes/prototype.pl
+++ b/usr/src/prototypes/prototype.pl
@@ -11,7 +11,7 @@
 #
 
 #
-# Copyright 2016 <contributor>
+# Copyright 2017 <contributor>
 #
 
 #
diff --git a/usr/src/prototypes/prototype.py b/usr/src/prototypes/prototype.py
index a54531cca1..98d0774650 100644
--- a/usr/src/prototypes/prototype.py
+++ b/usr/src/prototypes/prototype.py
@@ -11,7 +11,7 @@
 #
 
 #
-# Copyright 2016 <contributor>
+# Copyright 2017 <contributor>
 #
 
 #
diff --git a/usr/src/prototypes/prototype.s b/usr/src/prototypes/prototype.s
index 1d308a92c6..e04d523db1 100644
--- a/usr/src/prototypes/prototype.s
+++ b/usr/src/prototypes/prototype.s
@@ -10,7 +10,7 @@
  */
 
 /*
- * Copyright 2016 <contributor>
+ * Copyright 2017 <contributor>
  */
 
 	.file	"prototype.s"
diff --git a/usr/src/prototypes/prototype.sh b/usr/src/prototypes/prototype.sh
index 5b1e51e0a8..1e11d3fb9d 100644
--- a/usr/src/prototypes/prototype.sh
+++ b/usr/src/prototypes/prototype.sh
@@ -12,6 +12,6 @@
 #
 
 #
-# Copyright 2016 <contributor>
+# Copyright 2017 <contributor>
 #
 
diff --git a/usr/src/tools/scripts/webrev.sh b/usr/src/tools/scripts/webrev.sh
index 74b02fc923..d7f0813698 100644
--- a/usr/src/tools/scripts/webrev.sh
+++ b/usr/src/tools/scripts/webrev.sh
@@ -27,6 +27,7 @@
 # Copyright 2014 Bart Coddens <bart.coddens@gmail.com>
 # Copyright 2016 Nexenta Systems, Inc.
 # Copyright 2016 Joyent, Inc.
+# Copyright 2016 RackTop Systems.
 #
 
 #
@@ -2362,7 +2363,9 @@ elif [[ $SCM_MODE == "git" ]]; then
 		codemgr_ws="${PWD}/${codemgr_ws}"
 	fi
 
-	codemgr_ws=$(dirname $codemgr_ws) # Lose the '/.git'
+	if [[ "$codemgr_ws" = *"/.git" ]]; then
+		codemgr_ws=$(dirname $codemgr_ws) # Lose the '/.git'
+	fi
 	CWS="$codemgr_ws"
 elif [[ $SCM_MODE == "subversion" ]]; then
 	#