(cherry picked from commit 1ab0a979fdbcc933ae249838841dc7f61c0e5aba)

# Conflicts:
#	openair2/LAYER2/MAC/eNB_scheduler_fairRR.c