(cherry picked from commit 175c59ae3aedf612777cd1c8c88b6d6f254b9334)

(cherry picked from commit cf8f14edf4a261e1df72579423786d39ba6d97f9)

(cherry picked from commit 04c5431468c9102dd625a73d9e5219b40b638fe3)
(cherry picked from commit 17880778c848406e562f98c20f7b7a6428502279)
(cherry picked from commit a26f44c197e854dd4261267a3695932392f09265)

(cherry picked from commit 57caca9ba87fda3f73aa30d86f4af01a6062224c)

(cherry picked from commit 6d5a40bd826de160ddf55599f61d1359cfba3fa4)

(cherry picked from commit 5482843b9a9dfd25abe74afb04a40c117da3bac4)

(cherry picked from commit 3bed7dc69db8dc43b28b62553f12834efbca349b)

(cherry picked from commit 51634853671e07ef3013bc44ec79fc38c0646147)

(cherry picked from commit 0622f7d40523e39334708ce4b9b0ee68e8fb2bf1)

(cherry picked from commit de93d8f0aa9e6d7380bd159901a41aa36f257298)

(cherry picked from commit 120ea0950e1f52c1c5dd1d0dd4f7080e66d7ee93)

(cherry picked from commit 6f3d14e74663e75f2eaf3cd1c1348d5d028e3379)

SHA-1: 9bb7664a234535b01518977440b3c4f3d14a8ee3
SHA-1: c299d006d833e8ffc6c01039feaeda2e7b1598cc

(cherry picked from commit 4a18e26f8c1dfb80a5af2fac4104b06b648a598c)

(cherry picked from commit b0d6c5150db520bd7840d1604c3f82a0b59bc218)

(cherry picked from commit dcd188e961422194c9c85636ea7c74ca0cc5101d)

(cherry picked from commit d82fc4805ef9032c9bfd9705fef702a6e130f7b2)

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

(cherry picked from commit 56720c68864f6b04409deb00676e59a41c8f050b)

Fix: The remaining UL buffer size is incorrectly calculated and UL scheduling does not occur. (scheduled_ul_bytes is not subtracted correctly when receiving NACK rarely.)

(cherry picked from commit 2fb4823b57320c4c4e4d800ae9bb0570f18ad353)

(cherry picked from commit ce10221c2761fb3058ccb77b73ba87f97d5e2cd2)

(cherry picked from commit 1ab0a979fdbcc933ae249838841dc7f61c0e5aba)