Some compilation errors from merge branch 'STF531-DISCOVERY_TEST_CASES' into 'master' + update of the OneM2M_TestControl.ttcn

Signed-off-by: Miguel Angel Reina Ortega <miguelangel.reinaortega@etsi.org>