integration_2022_wk21

See merge request oai/openairinterface5g!1564

Merge remote-tracking branch 'origin/NR_removing_calculate_preferred_tda' into integration_2022_wk21

In the past, setting k2=2 for 5ms TDD periods resulted in increased ping
RTT and/or reestablishment requests. These problems do not appear
anymore, and we can allow k2=2.

In the past, activation of slot 0 (i.e., after the switch UL->DL)
resulted in many retransmissions. This does not seem to be the case
anymore, and we can therefore activate slot 0 also in TDD.

- Introduce generic get_mcs_from_cqi() that gets MCS for a particular
  CQI
- Set MCS after receiving CQI
- Distinguish "global" max MCS from UE-measured max MCS

integration_2022_wk19b

See merge request oai/openairinterface5g!1555

MR !1357: Bupt UL-MIMO
MR !1516: NR handling 2-port PMI report
MR !1454: Implementation of multiple dedicated BWPs
MR !1556: Fix RAN-gNB-nrUE-MONO-TDD-Band78-N300 pipeline

# Conflicts:
#	openair1/SIMULATION/NR_PHY/ulsim.c
#	openair2/LAYER2/NR_MAC_UE/nr_ue_scheduler.c
#	openair2/RRC/NR/rrc_gNB_reconfig.c

Ci enable amarisoft

See merge request oai/openairinterface5g!1554