(cherry picked from commit f709e4a765b3ab8461bafcba672bae6b9c3f966f)

(cherry picked from commit 624fe21f52117959940066a6cfc5f8beac70e462)

# Conflicts:
#	openair2/LAYER2/MAC/eNB_scheduler_RA.c
#	openair2/LAYER2/MAC/eNB_scheduler_dlsch.c
#	openair2/LAYER2/MAC/eNB_scheduler_fairRR.c
#	openair3/S1AP/s1ap_eNB.c

(cherry picked from commit 39850dcfadb37e24ccfe41e0a85a9f2136eeff4a)

(cherry picked from commit aaa4d390fdefc4e8071b80edc90a580907c9dec3)

(cherry picked from commit 519e6628d572c9b6cf8031632d4e22e2f8dc5b93)

(cherry picked from commit 2339972ceaeb75fe18c0b2ae9ea69216dd919668)

# Conflicts:
#	openair2/ENB_APP/enb_config.c
#	openair2/RRC/LTE/rrc_eNB_S1AP.c
#	openair3/S1AP/s1ap_common.h
#	openair3/S1AP/s1ap_eNB.c
#	openair3/S1AP/s1ap_eNB_handlers.c

(cherry picked from commit eae86561aea29b07afbcda79b6c2ad90162069f6)

# Conflicts:
#	openair2/ENB_APP/enb_config.c
#	openair2/LAYER2/MAC/eNB_scheduler_fairRR.c
#	targets/RT/USER/lte-enb.c
#	targets/RT/USER/lte-ru.c

(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