Merge branch 'NR_UL_scheduling' of https://gitlab.eurecom.fr/oai/openairinterface5g into NR_UL_scheduling

Conflicts:
	openair2/NR_PHY_INTERFACE/NR_IF_Module.c