RRC branch merge fix

openair1/PHY/INIT/nr_init.c

openair1/PHY/INIT/nr_parms.c

openair1/PHY/INIT/phy_init.h

openair1/PHY/NR_TRANSPORT/nr_dci.c

openair1/PHY/NR_TRANSPORT/nr_dci.h

openair1/PHY/NR_UE_TRANSPORT/nr_initial_sync.c

openair1/PHY/defs_nr_common.h

openair1/SCHED_NR/sched_nr.h

openair2/RRC/NR_UE/rrc_list.h

targets/RT/USER/nr-ru.c

targets/RT/USER/nr-ue.c

targets/RT/USER/nr-uesoftmodem.c