Merge branch 'STF531-REG-CRE' of https://git.onem2m.org/TST/ATS into STF531-REG-CRE

# Conflicts:
#	OneM2M_Testcases_AE.ttcn

LibOneM2M/OneM2M_Functions.ttcn

@@ -173,7 +173,7 @@ module OneM2M_Functions {
 			vc_testSystemRole := e_cse;		
 			
 			// Map
-			map(self:mcaPort, system:mcaPort);//TODO To be consistent, we should use mcaPortIn for AE testing
+			map(self:mcaPortIn, system:mcaPortIn);//TODO To be consistent, we should use mcaPortIn for AE testing
 			map(self:acPort, system:acPort);
 			map(self:utPort, system:utPort);
 			activate(a_default());
@@ -263,7 +263,7 @@ module OneM2M_Functions {
 		 */
 		function f_cf03Down() runs on CseSimu {
 			
-			unmap(self:mcaPort, system:mcaPort);
+			unmap(self:mcaPortIn, system:mcaPortIn);
 			unmap(self:utPort, system:utPort);
 			unmap(self:acPort, system:acPort);
 		}

LibOneM2M/OneM2M_TestSystem.ttcn

@@ -55,6 +55,7 @@ module OneM2M_TestSystem {
 		
 	type component CseSimu extends Tester {
 		port OneM2MPort mcaPort;
+		port OneM2MPort mcaPortIn;
 		port OneM2MPort mccPort;
 		port OneM2MPort mccPortIn;