Merge remote-tracking branch 'origin/develop-NR_SA_F1AP_5GRECORDS' into develop-NR_SA_F1AP_5GRECORDS-lts

# Conflicts:
#	openair2/GNB_APP/gnb_app.c
#	openair2/RRC/NR/rrc_gNB.c