diff --git a/cts/schemas/test-3/ref.err/duplicate-nvpairs-no-default.ref.err-3 b/cts/schemas/test-3/ref.err/duplicate-nvpairs-no-default.ref.err-3
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/cts/schemas/test-3/ref.err/duplicate-nvpairs-with-default.ref.err-3 b/cts/schemas/test-3/ref.err/duplicate-nvpairs-with-default.ref.err-3
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/cts/schemas/test-3/ref.err/id-ref.ref.err-3 b/cts/schemas/test-3/ref.err/id-ref.ref.err-3
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/cts/schemas/test-3/ref.err/lifetime-1.ref.err-3 b/cts/schemas/test-3/ref.err/lifetime-1.ref.err-3
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/cts/schemas/test-3/ref.err/lifetime-2.ref.err-3 b/cts/schemas/test-3/ref.err/lifetime-2.ref.err-3
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/cts/schemas/test-3/ref.err/multiple-location-rules.ref.err-3 b/cts/schemas/test-3/ref.err/multiple-location-rules.ref.err-3
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/cts/schemas/test-3/ref.err/no-validate-with.ref.err-3 b/cts/schemas/test-3/ref.err/no-validate-with.ref.err-3
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/cts/schemas/test-3/ref.err/nvpair-no-value.ref.err-3 b/cts/schemas/test-3/ref.err/nvpair-no-value.ref.err-3
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/cts/schemas/test-3/ref.err/sort-nvsets.ref.err-3 b/cts/schemas/test-3/ref.err/sort-nvsets.ref.err-3
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/cts/schemas/test-3/ref/duplicate-nvpairs-no-default.ref-3 b/cts/schemas/test-3/ref/duplicate-nvpairs-no-default.ref-3
new file mode 100644
index 0000000000..9f0abd6d13
--- /dev/null
+++ b/cts/schemas/test-3/ref/duplicate-nvpairs-no-default.ref-3
@@ -0,0 +1,41 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/cts/schemas/test-3/ref/duplicate-nvpairs-with-default.ref-3 b/cts/schemas/test-3/ref/duplicate-nvpairs-with-default.ref-3
new file mode 100644
index 0000000000..b2e24f4e22
--- /dev/null
+++ b/cts/schemas/test-3/ref/duplicate-nvpairs-with-default.ref-3
@@ -0,0 +1,51 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/cts/schemas/test-3/ref/id-ref.ref-3 b/cts/schemas/test-3/ref/id-ref.ref-3
new file mode 100644
index 0000000000..d33ffb253e
--- /dev/null
+++ b/cts/schemas/test-3/ref/id-ref.ref-3
@@ -0,0 +1,71 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/cts/schemas/test-3/ref/lifetime-1.ref-3 b/cts/schemas/test-3/ref/lifetime-1.ref-3
new file mode 100644
index 0000000000..982c439a39
--- /dev/null
+++ b/cts/schemas/test-3/ref/lifetime-1.ref-3
@@ -0,0 +1,152 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/cts/schemas/test-3/ref/lifetime-2.ref-3 b/cts/schemas/test-3/ref/lifetime-2.ref-3
new file mode 100644
index 0000000000..8fb1725898
--- /dev/null
+++ b/cts/schemas/test-3/ref/lifetime-2.ref-3
@@ -0,0 +1,70 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/cts/schemas/test-3/ref/multiple-location-rules.ref-3 b/cts/schemas/test-3/ref/multiple-location-rules.ref-3
new file mode 100644
index 0000000000..7b72e5629e
--- /dev/null
+++ b/cts/schemas/test-3/ref/multiple-location-rules.ref-3
@@ -0,0 +1,155 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/cts/schemas/test-3/ref/no-validate-with.ref-3 b/cts/schemas/test-3/ref/no-validate-with.ref-3
new file mode 100644
index 0000000000..392eb408f3
--- /dev/null
+++ b/cts/schemas/test-3/ref/no-validate-with.ref-3
@@ -0,0 +1,15 @@
+
+
+
+
+
+
+
+
+
+
diff --git a/cts/schemas/test-3/ref/nvpair-no-value.ref-3 b/cts/schemas/test-3/ref/nvpair-no-value.ref-3
new file mode 100644
index 0000000000..5820a8429d
--- /dev/null
+++ b/cts/schemas/test-3/ref/nvpair-no-value.ref-3
@@ -0,0 +1,33 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/cts/schemas/test-3/ref/sort-nvsets.ref-3 b/cts/schemas/test-3/ref/sort-nvsets.ref-3
new file mode 100644
index 0000000000..38cfc6e4cc
--- /dev/null
+++ b/cts/schemas/test-3/ref/sort-nvsets.ref-3
@@ -0,0 +1,115 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/xml/upgrade-3.10-3.xsl b/xml/upgrade-3.10-3.xsl
new file mode 100644
index 0000000000..76e8d5f9fa
--- /dev/null
+++ b/xml/upgrade-3.10-3.xsl
@@ -0,0 +1,23 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+