Merge remote-tracking branch 'origin/x2' into develop_integration_2018_w35

ci-scripts/conf_files/enb.band7.tm1.100PRB.usrpb210.conf

ci-scripts/conf_files/enb.band7.tm1.25PRB.usrpb210.conf

ci-scripts/conf_files/enb.band7.tm1.50PRB.usrpb210.conf

cmake_targets/CMakeLists.txt

...utotests/v2/config/enb.band38.tm1.usrpb210.tdd.10MHz.conf

...utotests/v2/config/enb.band38.tm1.usrpb210.tdd.20MHz.conf

...autotests/v2/config/enb.band38.tm1.usrpb210.tdd.5MHz.conf

...autotests/v2/config/enb.band7.tm1.usrpb210.fdd.10MHz.conf

...autotests/v2/config/enb.band7.tm1.usrpb210.fdd.20MHz.conf

.../autotests/v2/config/enb.band7.tm1.usrpb210.fdd.5MHz.conf

...argets/autotests/v2/config/rcc.band7.tm1.if4p5.10MHz.conf

...argets/autotests/v2/config/rcc.band7.tm1.if4p5.20MHz.conf

...targets/autotests/v2/config/rcc.band7.tm1.if4p5.5MHz.conf

...sts/v2/config/rru.band7.tm1.if4p5.10MHz.udp.usrpb210.conf

...sts/v2/config/rru.band7.tm1.if4p5.20MHz.udp.usrpb210.conf

...ests/v2/config/rru.band7.tm1.if4p5.5MHz.udp.usrpb210.conf

openair2/COMMON/x2ap_messages_def.h

openair2/COMMON/x2ap_messages_types.h

openair2/ENB_APP/enb_app.c

openair2/ENB_APP/enb_config.c