Merge remote-tracking branch 'origin/develop' into enhancement-rfsim
Conflicts: cmake_targets/build_oai openair2/LAYER2/MAC/eNB_scheduler_ulsch.c targets/PROJECTS/GENERIC-LTE-EPC/CONF/rcc.band7.tm1.if4p5.50PRB.lo.conf targets/RT/USER/lte-ru.c targets/RT/USER/lte-softmodem.c targets/RT/USER/lte-uesoftmodem.c
ci-scripts/buildLocally.sh
0 → 100755
ci-scripts/buildOnVM.sh
0 → 100755