XSD v1_12_0 baseline

# Conflicts:
#	CDT-AE.xsd
#	CDT-CSEBase.xsd
#	CDT-accessControlPolicy.xsd
#	CDT-activeCmdhPolicy.xsd
#	CDT-areaNwkDeviceInfo.xsd
#	CDT-areaNwkInfo.xsd
#	CDT-battery.xsd
#	CDT-cmdhBuffer.xsd
#	CDT-cmdhDefEcValue.xsd
#	CDT-cmdhDefaults.xsd
#	CDT-cmdhEcDefParamValues.xsd
#	CDT-cmdhLimits.xsd
#	CDT-cmdhNetworkAccessRules.xsd
#	CDT-cmdhNwAccessRule.xsd
#	CDT-cmdhPolicy.xsd
#	CDT-commonTypes.xsd
#	CDT-container.xsd
#	CDT-contentInstance.xsd
#	CDT-delivery.xsd
#	CDT-deviceCapability.xsd
#	CDT-deviceInfo.xsd
#	CDT-eventConfig.xsd
#	CDT-eventLog.xsd
#	CDT-execInstance.xsd
#	CDT-firmware.xsd
#	CDT-group.xsd
#	CDT-locationPolicy.xsd
#	CDT-m2mServiceSubscriptionProfile.xsd
#	CDT-memory.xsd
#	CDT-mgmtCmd.xsd
#	CDT-node.xsd
#	CDT-notification.xsd
#	CDT-pollingChannel.xsd
#	CDT-reboot.xsd
#	CDT-remoteCSE.xsd
#	CDT-request.xsd
#	CDT-requestPrimitive.xsd
#	CDT-responsePrimitive.xsd
#	CDT-schedule.xsd
#	CDT-serviceSubscribedAppRule.xsd
#	CDT-serviceSubscribedNode.xsd
#	CDT-software.xsd
#	CDT-statsCollect.xsd
#	CDT-statsConfig.xsd
#	CDT-subscription.xsd

CDT-commonTypes.xsd

@@ -325,7 +325,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 
 	<xs:complexType name="primitiveContent">
 		<xs:sequence>
-			<xs:any namespace="http://www.onem2m.org/xml/protocols" processContents="lax" minOccurs="0" maxOccurs="unbounded" />
+			<xs:any namespace="http://www.onem2m.org/xml/protocols" processContents="lax" minOccurs="0" />
 		</xs:sequence>
 	</xs:complexType>
 	

CDT-enumerationTypes.xsd

@@ -883,32 +883,6 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
         </xs:restriction>
     </xs:simpleType>
     
-    <xs:simpleType name="SRole-ID">
-        <xs:restriction base="xs:token">
-            <!-- Software Management -->
-            <xs:enumeration value="01-001" />
-            <!-- Device Configuration -->
-            <xs:enumeration value="02-001" />
-            <!-- Device Diagnostics and Management -->
-            <xs:enumeration value="02-002" />
-            <!-- Device Firmware Management -->
-            <xs:enumeration value="02-003" />
-            <!-- Device Topology -->
-            <xs:enumeration value="02-004" />
-            <!-- Location -->
-            <xs:enumeration value="03-001" />
-            <!-- Basic Data -->
-            <xs:enumeration value="04-001" />
-            <!-- Onboarding -->
-            <xs:enumeration value="05-001" />
-            <!-- Security Administration -->
-            <xs:enumeration value="06-001" />
-            <!-- Groups Management -->
-            <xs:enumeration value="07-001" />
-            <!-- Event Collection -->
-            <xs:enumeration value="08-001" />
-        </xs:restriction>
-    </xs:simpleType>
     
     <xs:simpleType name="filterUsage">
         <xs:annotation>

CDT-m2mServiceSubscriptionProfile.xsd

@@ -37,12 +37,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 				<xs:extension base="m2m:regularResource">
 					<xs:sequence>
 						<!-- Resource Specific Attributes -->
-						<xs:element name="serviceRoles" minOccurs="0">
-							<xs:simpleType>
-								<xs:list itemType="m2m:SRole-ID" />
-							</xs:simpleType>
-						</xs:element>
-
+						
 						<!-- Child Resources -->
 						<xs:choice minOccurs="0" maxOccurs="1">
 							<xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />