Merge with NR_F1C_F1U_extensions and resolve conflicts

ci-scripts/Jenkinsfile-GitLab-Container

ci-scripts/Jenkinsfile-push-registry

ci-scripts/Jenkinsfile-tmp-multi-enb-nsa

ci-scripts/Jenkinsfile-trig-nsa

ci-scripts/ci_ueinfra.yaml

ci-scripts/cls_containerize.py

ci-scripts/cls_module_ue.py

ci-scripts/cls_oaicitest.py

ci-scripts/conf_files/channelmod_rfsimu.conf

...cripts/conf_files/enb.band38.lte_2x2.100PRB.usrpn310.conf

...cripts/conf_files/enb.band38.nsa_2x2.100PRB.usrpn310.conf

ci-scripts/conf_files/gNB_SA_n78_106PRB.2x2_usrpn310.conf

ci-scripts/conf_files/gNB_SA_n78_133PRB.2x2_usrpn310.conf

ci-scripts/conf_files/gnb.band261.tm1.32PRB.usrpn300.conf

ci-scripts/conf_files/gnb.band66.tm1.106PRB.usrpn300.conf

...cripts/conf_files/gnb.band78.nsa_2x2.106PRB.usrpn310.conf

...pts/conf_files/gnb.band78.sa.fr1.106PRB.2x2.usrpn310.conf

ci-scripts/conf_files/gnb.band78.sa.fr1.106PRB.usrpn310.conf

ci-scripts/conf_files/gnb.band78.tm1.106PRB.usrpn300.conf

...cripts/conf_files/gnb.band78.tm1.fr1.106PRB.usrpb210.conf