Conflicts:
	common/utils/LOG/log.c
	targets/RT/USER/lte-enb.c
	targets/RT/USER/lte-softmodem.c

Develop integration 2018 week 48

See merge request oai/openairinterface5g!462

Integration of the following MRs:

 - MR 448: Missing RRC inactivity timer
 - MR 458: Adding MAC main config to RRC connection setup
 - MR 457: Resolving "parallelization not working correctly in phy simulators"
 - MR 460: Fixing RU DFT initialization

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

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

Merge remote-tracking branch 'origin/373-parallelization-not-working-correctly-in-phy-simulators-and-bad-implementation-2' into develop_integration_w48
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>

Merge remote-tracking branch 'origin/add-mac_MainConfig-to-RRCConnectionSetup' into develop_integration_w48

Merge remote-tracking branch 'origin/374-missing-rrc-inactivity-timer-missing-default-drx-ie-in-s1-setup-ue-s1-id-unknown-after-detach-for-switch-off' into develop_integration_w48

Conflicts:
	common/utils/LOG/log.c
	targets/RT/USER/lte-softmodem.c
	targets/RT/USER/lte-uesoftmodem.c

Merge branch '373-parallelization-not-working-correctly-in-phy-simulators-and-bad-implementation-2' into L1_renaming

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

initialization of dfts for RU. moved init_dfts out from lte_init_top into lte_init_RU() and lte_init_ue_signal()

  -- RAW record file is parsed and replayed
  -- Replayed log file is parsed instead of normal eNB file during terminate
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>

Merge remote-tracking branch 'origin/develop' into 374-missing-rrc-inactivity-timer-missing-default-drx-ie-in-s1-setup-ue-s1-id-unknown-after-detach-for-switch-off
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>

Develop integration 2018 week 47

See merge request oai/openairinterface5g!456

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

  -- tracing is done w/ a single UE attach / detach
  -- traffic b/ EPC and eNB is captured by tshark
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>

adds a mac_MainConfig information element to RRCConnectionSetup. This is to configure PHR reporting during the first part of the Attach procedure.

RRC timer thres removed from UE context and added to eNB RRC context, value 0 of thres equivalent to infinity

Merge remote-tracking branch 'origin/issue362_getoptions_errorhandling' into develop_integration_2018_w47