Conflicts:
	openair2/ENB_APP/enb_config.c
	openair2/LAYER2/MAC/eNB_scheduler_ulsch.c
	openair2/RRC/LTE/MESSAGES/asn1_msg.c
	openair2/RRC/LTE/MESSAGES/asn1_msg.h
	openair2/RRC/LTE/rrc_defs.h
	openair2/RRC/LTE/rrc_eNB.c
	openair2/RRC/LTE/rrc_eNB_S1AP.c
	openair2/RRC/LTE/rrc_proto.h
	openair3/GTPV1-U/gtpv1u_eNB.c
	openair3/S1AP/s1ap_eNB_handlers.c

See merge request oai/openairinterface5g!486

Integration Branch: 2019 week 03

* MR 477: Resolve "384 obsolete files to delete"
* MR 479: Fix on allow remote connection in tcpbridge
* MR 480: Ue hotfix u emode during initial connection
* MR 484: Fix on T early logs
* MR 485: Fix on exit softmodem when a command line option requiring an argument is specified

Merge remote-tracking branch 'origin/ue-hotfix-UEmode-during-initial-connection' into develop_integration_2019_w03

Merge remote-tracking branch 'origin/issue-389-fix-missing-option-value-not-reported' into develop_integration_2019_w03

Merge remote-tracking branch 'origin/issue-388-fix-missing-logs-at-startup' into develop_integration_2019_w03

Merge remote-tracking branch 'origin/issue386_tcpbrige_remoteconnection' into develop_integration_2019_w03

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

Merge remote-tracking branch 'origin/issue386_tcpbrige_remoteconnection' into develop_integration_2019_w03

Merge remote-tracking branch 'origin/384-obsolete-files-to-delete' into develop_integration_2019_w03

CI: adapt parameters for better FDD performances

See merge request oai/openairinterface5g!481

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

    also disabling LLL realtime issues as an error until PRACH allocation is fixed
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>

exit softmodem when a command line option requiring an argument is specified without an option value. Previous behavior was to print a message and ignore the option

The variable T_stdout needs to be 1 at startup to avoid missing logs.

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

corrected bug in handling of UE_mode during initial connection once timing synchronization condition (hysteresis count) is satisfied.

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

modify tcp_bridge_oai.c to support remote connections, old behavior is maintained, define TCPBRIDGE environment variable to the enb ip address on ue side.

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

Develop integration 2018 week 51

See merge request oai/openairinterface5g!470

Integration branch for week 51 (2018). Last of the year
The following MRs have been merged:

- 440 : L1 renaming
- 459 : dlsim format1A testing
- 464 : Iris HW support
- 466 : Workshop demo
- 467 : compilation make fix for ASN1C
- 468 : limeSDR compilation fix

In addition: added support for multi-XML scenarios on slave CI jobs

Merge remote-tracking branch 'origin/enhancement-dlsim-format1A-testing' into develop_integration_2018_w51

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

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

Merge remote-tracking branch 'origin/develop-ci-multi-xml-scenarios-support' into develop_integration_2018_w51