(cherry picked from commit 5b02ce3d1bf858dbe13aa17c010f9f9d81252ae7)

# Conflicts:
#	openair2/RRC/LTE/rrc_eNB.c

(cherry picked from commit 08f5703c0f8828b85148c9a1171cca283140d528)

(cherry picked from commit b77568781c0bfb391c3973e7d63fe302a19e2b7e)

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

(cherry picked from commit a84adae14278d7e26f0ffe9d4e58021bbd3ab27a)

(cherry picked from commit 8d812460c4f42cb294c3ce86f030780c64c3b739)

# Conflicts:
#	openair2/RRC/LTE/rrc_eNB.c

(cherry picked from commit 88771693f0c45011ab2759819ea91ef2a7315acd)

(cherry picked from commit badbcf2e73adb420acd10b9020208e1471e3923e)

(cherry picked from commit 18f42f87e62bb235e5e1f3f6120d6c76e4171c96)

(cherry picked from commit 37e020ad08ac96eadd332e6b11ede06fa921d5f8)

(cherry picked from commit c835c70e1f07b044b0b5ce270af545d6b049fe1c)

(cherry picked from commit 2afac3f92ccea2af74b714131ca4133136cf8152)

SHA-1: 9bb7664a234535b01518977440b3c4f3d14a8ee3
SHA-1: c299d006d833e8ffc6c01039feaeda2e7b1598cc

(cherry picked from commit 4a18e26f8c1dfb80a5af2fac4104b06b648a598c)

(cherry picked from commit 8feabbef49c68f1f46e1dde0a3763b13680afcb5)

(cherry picked from commit b0d6c5150db520bd7840d1604c3f82a0b59bc218)

(cherry picked from commit dcd188e961422194c9c85636ea7c74ca0cc5101d)

# Conflicts:
#	openair1/PHY/LTE_TRANSPORT/ulsch_demodulation.c

(cherry picked from commit 541b9e07f0573cfebb00a24f675d72459bbd5eb2)