Merge branch 'develop' into issue392-simplify-s1-nos1step2

README.txt

ci-scripts/buildOnVM.sh

ci-scripts/cppcheck_suppressions.list

ci-scripts/createVM.sh

ci-scripts/main.py

ci-scripts/runTestOnVM.sh

common/utils/T/tracer/gui/notify.c

common/utils/T/tracer/textlog.c

common/utils/T/tracer/utils.c

openair1/PHY/TOOLS/lte_phy_scope_tm4.c

openair2/LAYER2/MAC/eNB_scheduler_dlsch.c

openair2/LAYER2/MAC/eNB_scheduler_fairRR.c

openair2/LAYER2/MAC/eNB_scheduler_primitives.c

openair2/LAYER2/MAC/mac_proto.h

openair2/LAYER2/MAC/pre_processor.c

openair3/S1AP/s1ap_eNB_trace.c

openair3/TEST/EPC_TEST/generate_scenario.c

openair3/TEST/EPC_TEST/play_scenario.c

targets/ARCH/USRP/USERSPACE/LIB/usrp_lib.cpp

targets/RT/USER/lte-ru.c