Merge branch 'remotes/origin/AE-fixes'

Signed-off-by: reinaortega <miguelangel.reinaortega@etsi.org>

LibOneM2M/OneM2M_Templates.ttcn

@@ -134,8 +134,8 @@ module OneM2M_Templates {
 				to_ := p_targetResourceAddress,
 				from_ := ?,
 				requestIdentifier := ?,
-				resourceType := ?,
-				primitiveContent := ?,
+				resourceType := omit,
+				primitiveContent := *,
 				roleIDs := *, 
 				originatingTimestamp := *,
 				requestExpirationTimestamp := *,