Conflicts:
	openair2/LAYER2/MAC/eNB_scheduler_bch.c
	openair2/RRC/LITE/L2_interface.c
	targets/ARCH/USRP/USERSPACE/LIB/usrp_lib.cpp

Conflicts:
	openair2/ENB_APP/enb_config.c

complete programming of Msg2/Msg4 procedures for eMTC. Addition of skeleton for PUCCH UCI (NFAPI) in L1. Some cleanup of eNB_scheduler.c

Merge branch 'RU-RAU-split' of https://gitlab.eurecom.fr/raymond.knopp/openairinterface5g into RU-RAU-split

Conflicts:
	openair2/LAYER2/MAC/eNB_scheduler_ulsch.c

Conflicts:
	openair2/ENB_APP/enb_config.c

fixes for RRU/RAU function after changes for monolithic eNB (some things during init were broken for RRU)

Conflicts:
	openair2/ENB_APP/enb_config.c

Merge branch 'RU-RAU-split' of https://gitlab.eurecom.fr/raymond.knopp/openairinterface5g into RU-RAU-split

L1/L2 scheduling extensions for BL/CE operation, BR random-access procedure, BR PRACH detection. Still untested, but compilation succeeds. Missing elements in L2 - PUSCH programming for Msg3, Msg4 retransmission programming for BL/CE. DLSCH/ULSCH programming for UE-specific DLSCH/ULSCH for BL/CE

Merge branch 'RU-RAU-split' of https://gitlab.eurecom.fr/raymond.knopp/openairinterface5g into RU-RAU-split

Conflicts:
	openair2/ENB_APP/enb_config.c
	openair2/RRC/LITE/MESSAGES/asn1_msg.c
	openair2/RRC/LITE/MESSAGES/asn1_msg.h