(cherry picked from commit 8cb7279f98664fdd6cd1200ef5d59c0ddebdb785)

(cherry picked from commit 175c59ae3aedf612777cd1c8c88b6d6f254b9334)

(cherry picked from commit f6b51079021347c19d528200f04d7cdba1dde0e5)

(cherry picked from commit 412f15df9171af5b1f4766854e292b09370a1b3e)
(cherry picked from commit 55b6d866d3c1ebd3095a44661e4e435f15d3cd7f)

(cherry picked from commit 92af97ff22b1a244db29a01e32feb58c237994b2)

(cherry picked from commit cd8c6095bc3f13a60a6710a690a068795c5a77b2)

(cherry picked from commit bea66ef41df2b1e2b04877090b92c7740f9070c1)

(cherry picked from commit d3a5c0e805d4e46e764ae3bb8cafc891d6dc5225)

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

(cherry picked from commit d6ae90be8937e8ed7d7965475c8d20ea2f2c878c)

(cherry picked from commit 27c97696ce5ada578c454aeb5abbff5f07eda730)

(cherry picked from commit a965a1b6b76c54e10f2766782c8b9e04304123a2)

(cherry picked from commit 442c24f4e95e531ed258009355d9db238d9c54f5)

(cherry picked from commit 7013d216db25347d89d6152f37aea5333f72c372)

(cherry picked from commit cf8f14edf4a261e1df72579423786d39ba6d97f9)

(cherry picked from commit a51c2f08c8699e4367ff1b95028662ce22f88b9d)

# Conflicts:
#	common/utils/T/tracer/extract.c
#	common/utils/T/tracer/extract_input_subframe.c
#	common/utils/T/tracer/extract_output_subframe.c
#	common/utils/T/tracer/hacks/dump_nack_signal.c
#	common/utils/T/tracer/hacks/multi-rru-clean.c
#	common/utils/T/tracer/record.c
#	common/utils/T/tracer/to_vcd.c
#	common/utils/itti_analyzer/libparser/xml_parse.c
#	common/utils/itti_analyzer/libui/ui_filters.c
#	common/utils/itti_analyzer/libui/ui_notifications.c
#	common/utils/msc/msc.c
#	nfapi/open-nFAPI/vnf/src/vnf_p7.c
#	nfapi/open-nFAPI/vnf/src/vnf_p7_interface.c
#	openair1/PHY/CODING/3gpplte_turbo_decoder_avx2_16bit.c
#	openair1/PHY/CODING/3gpplte_turbo_decoder_sse_16bit.c
#	openair1/PHY/LTE_ESTIMATION/bf_freq_domain_filters.m
#	openair1/PHY/LTE_ESTIMATION/freq_domain_filters.m
#	openair1/PHY/LTE_REFSIG/gen_mod_table.m
#	openair1/PHY/LTE_REFSIG/primary_synch.m
#	openair1/PHY/TOOLS/lte_dfts.c
#	openair1/PHY/TOOLS/lte_enb_scope.c
#	openair1/PHY/TOOLS/lte_ue_scope.c
#	openair1/PHY/TOOLS/smbv.c
#	openair1/SIMULATION/LTE_PHY/Abstraction/Training/polyfit_beta_training.m
#	openair1/SIMULATION/LTE_PHY/Abstraction/Training/training_abstraction.m
#	openair1/SIMULATION/LTE_PHY/dlsim.c
#	openair1/SIMULATION/LTE_PHY/dlsim_tm4.c
#	openair1/SIMULATION/LTE_PHY/dlsim_tm7.c
#	openair1/SIMULATION/LTE_PHY/mat2wv.m
#	openair1/SIMULATION/LTE_PHY/mbmssim.c
#	openair1/SIMULATION/LTE_PHY/pbchsim.c
#	openair1/SIMULATION/LTE_PHY/scansim.c
#	openair1/SIMULATION/LTE_PHY/syncsim.c
#	openair1/SIMULATION/LTE_PHY/ulsim.c
#	openair1/SIMULATION/TOOLS/corr_mat.m
#	openair3/TEST/EPC_TEST/generate_scenario.c
#	openair3/TEST/EPC_TEST/play_scenario_parse.c
#	targets/ARCH/USRP/USERSPACE/LIB/usrp_lib.cpp
#	targets/RT/USER/lte-ue.c

(cherry picked from commit 63e04f586948f15f125ad464d228fc19ceae7559)

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

(cherry picked from commit 57caca9ba87fda3f73aa30d86f4af01a6062224c)

(cherry picked from commit 7db6a2b3b812cf3319d8a97ba44f9764b0950ca1)

(cherry picked from commit 3e6d468b1938a2bf006e7bca8a7249d12ff64745)

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

(cherry picked from commit 7138f92b0b153bb94a821b9cdc06ed4908a35e5a)

(cherry picked from commit 4868cbbec45450277707f069b9f5603926221fe7)

(cherry picked from commit 0b2c605b73e7daaffeccfff151708a48f7150663)

(cherry picked from commit 9f6e9ee61bbcbe827efcc5ca101d0afd8c34e1fd)

(cherry picked from commit 6d5a40bd826de160ddf55599f61d1359cfba3fa4)

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

(cherry picked from commit 5482843b9a9dfd25abe74afb04a40c117da3bac4)