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)

(cherry picked from commit 2d45f940be267e013781d6baba5b2ab665e64c88)

# Conflicts:
#	nfapi/open-nFAPI/vnf/src/vnf_p7_interface.c

(cherry picked from commit d82fc4805ef9032c9bfd9705fef702a6e130f7b2)

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

# Conflicts:
#	openair1/SCHED/phy_procedures_lte_eNb.c
#	openair2/LAYER2/MAC/eNB_scheduler.c
#	openair2/LAYER2/MAC/eNB_scheduler_primitives.c
#	openair2/LAYER2/MAC/eNB_scheduler_ulsch.c
#	openair2/LAYER2/MAC/mac.h

(cherry picked from commit 56720c68864f6b04409deb00676e59a41c8f050b)

# Conflicts:
#	openair1/SCHED/phy_procedures_lte_eNb.c
#	openair2/LAYER2/MAC/eNB_scheduler_fairRR.c
#	openair2/LAYER2/MAC/eNB_scheduler_ulsch.c

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 a70935c2b135506eed72e4f00d28910a9ffc9dc6)

(cherry picked from commit 1ea6d25f9c6ab60c0508df7326a769b322ba2f82)

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

(cherry picked from commit 11485a6f7b76288e3db58435717afb4e5e63b0eb)

(cherry picked from commit 4db6ed6747e9b3dfa62db9597a7bdb8508b9ced5)

(cherry picked from commit ce10221c2761fb3058ccb77b73ba87f97d5e2cd2)

(cherry picked from commit af12c48237f7816c5671ca4d436b08ddd51718fe)

(cherry picked from commit e8e15e650d4308bb4ff8ea9ca2e426ea13e71ae6)

(cherry picked from commit 2628fda6e636bf34752579d825bf0236f01377ad)

(cherry picked from commit e9c7c1aae5e61848f0290284ca83d3529553122b)

(cherry picked from commit e44126e27e81f53e67b5d5704c2e2b3f96b80062)

(cherry picked from commit 714db6c306e2d4d09294997febc33c7a817cb6f1)

(cherry picked from commit 8e684d03ee88407212df8ab277be50fcf9c42abd)

(cherry picked from commit b52cc92d0d3249c8b1762e62378266c67173d680)

(cherry picked from commit aeeaf30a989c61a59e2d16d02629d145e4f5beda)

(cherry picked from commit b9e93a16379cf261502d9451b60bd787c07da64e)