manual merge because conflict

ci-scripts/Jenkinsfile-tmp-ran

ci-scripts/checkCodingFormattingRules.sh

ci-scripts/conf_files/enb.band7.tm1.100PRB.usrpb210.conf

ci-scripts/conf_files/enb.band7.tm1.25PRB.usrpb210.conf

ci-scripts/conf_files/enb.band7.tm1.50PRB.usrpb210.conf

ci-scripts/conf_files/lte-fdd-basic-sim.conf

ci-scripts/conf_files/lte-tdd-basic-sim.conf

ci-scripts/main.py

ci-scripts/reportBuildLocally.sh

ci-scripts/reportTestLocally.sh

ci-scripts/runTestOnVM.sh

cmake_targets/CMakeLists.txt

common/utils/msc/msc.h

common/utils/ocp_itti/intertask_interface.cpp

common/utils/ocp_itti/intertask_interface.h

openair1/PHY/INIT/lte_param_init.c

openair1/PHY/LTE_TRANSPORT/dlsch_coding.c

openair1/PHY/LTE_TRANSPORT/ulsch_decoding.c

openair1/PHY/defs_common.h

openair1/PHY/defs_eNB.h