Merge branch 'develop' into feature-merge-f68

cmake_targets/CMakeLists.txt

cmake_targets/build_oai

cmake_targets/epc_test/CMakeLists.template

cmake_targets/lte-simulators/CMakeLists.txt

cmake_targets/oaisim_build_oai/CMakeLists.template

cmake_targets/oaisim_mme_build_oai/CMakeLists.template

cmake_targets/oaisim_noS1_build_oai/CMakeLists.template

cmake_targets/s1c_mme_test/CMakeLists.template

cmake_targets/tools/build_helper

cmake_targets/tools/init_nas_nos1

common/config/config_userapi.c

common/utils/T/T_defs.h

common/utils/T/T_messages.txt

common/utils/itti/intertask_interface.c

common/utils/itti/intertask_interface.h

common/utils/itti/intertask_interface_dump.c

common/utils/itti/itti_types.h

common/utils/itti/memory_pools.c

common/utils/telnetsrv/CMakeLists.txt

nfapi/README