Merge remote-tracking branch 'develop'

Conflicts:
	openair1/PHY/NR_TRANSPORT/nr_dlsch.c
	openair1/PHY/NR_UE_ESTIMATION/nr_dl_channel_estimation.c
	openair1/PHY/NR_UE_TRANSPORT/nr_dlsch_demodulation.c
	openair1/SCHED_NR_UE/phy_procedures_nr_ue.c
	openair2/RRC/NR/nr_rrc_proto.h

nfapi/open-nFAPI/nfapi/public_inc/fapi_nr_ue_interface.h

@@ -485,7 +485,7 @@ typedef struct {
   uint8_t nEpreRatioOfPDSCHToPTRS;
   /// MCS table for this DLSCH
   uint8_t mcs_table;
-  
+
   uint16_t pduBitmap;
 } fapi_nr_dl_config_dlsch_pdu_rel15_t;