This reverts commit 615f365b.

- now the UE is passing again data to the upper layers in noS1 mode
- minor cleanups

phone was not happy with other settings

Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>

Develop integration 2020 week 04

See merge request oai/openairinterface5g!763

The following MRs have been included:

* MR [726] : Flexran improvements
* MR [756] : remove uhd_set_thread_priority function
* MR [757] : HOTFIX: After develop/develop-nr merge UE was crashing with MBMS U-Plane traffic running
* MR [758] : Improve build after nr lte merge
* MR [759] : Doc update after 5g lte merge and latest build procedure modifications
* MR [761] : fixes for mutex lock for wake up signal
* MR [761] : CI: count ULSCH received ok messages

Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>

Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>

Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>

Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>

Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>

An NR-capable UE will transmit some NR measurements.
Once received, the whole process on nr-cell addition is started.
It will fail quickly.

Many things are still missing.

What is not handled properly with this commit:
- in x2ap_eNB_handle_sgNB_add_req we hardcode the gNB ID
- nr triggering is done if we receive a measurement but this measurement is
  not analyzed at all
- no timers (T_dc_overall, T_dc_prep) and as is the code fails and then the
  next triggering after UE reconnection will not work (x2 ID are not well
  handled here and there in the code)

Note also that the gNB part has not been looked at all for this commit.

This is work in progress...