Merge develop done, conflicts resolved

ci-scripts/Jenkinsfile-gitlab

ci-scripts/Jenkinsfile-tmp-ran

ci-scripts/buildOnVM.sh

...f_files/enb.band40.tm1.100PRB.FairScheduler.usrpb210.conf

...nf_files/enb.band40.tm1.25PRB.FairScheduler.usrpb210.conf

...nf_files/enb.band40.tm1.50PRB.FairScheduler.usrpb210.conf

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/enb.band7.tm2.25PRB.usrpb210.conf

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

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

...f_files/rcc.band40.tm1.100PRB.FairScheduler.usrpb210.conf

...nf_files/rcc.band40.tm1.25PRB.FairScheduler.usrpb210.conf

...nf_files/rcc.band40.tm1.50PRB.FairScheduler.usrpb210.conf

...ts/conf_files/rcc.band7.tm1.if4p5.lo.100PRB.usrpb210.conf

...pts/conf_files/rcc.band7.tm1.if4p5.lo.25PRB.usrpb210.conf

...pts/conf_files/rcc.band7.tm1.if4p5.lo.50PRB.usrpb210.conf

ci-scripts/createVM.sh

ci-scripts/destroyAllRunningVM.sh