Merge branch 'mbed-os-workshop-17q2' into ublox_rearrange_odin_target

# Conflicts:
#	targets/TARGET_STM/TARGET_STM32F4/TARGET_UBLOX_EVK_ODIN_W2/flash_api.c
#	targets/targets.json

Author: andreas.larsson

TESTS/mbedtls/ecp/main.cpp

@@ -20,8 +20,6 @@
 #include "utest.h"
 #include "rtos.h"
 
-using namespace utest::v1;
-
 #if !defined(MBEDTLS_CONFIG_FILE)
 #include "mbedtls/config.h"
 #else
@@ -39,6 +37,8 @@ using namespace utest::v1;
 #include <stdlib.h>
 #endif
 
+using namespace utest::v1;
+
 #ifndef PUT_UINT32_BE
 #define PUT_UINT32_BE(n,b,i)                            \
 {                                                       \