Merge branch 'issue_345_l2_fapi_simulator_new_jan2019' into 'develop'

ci-scripts/Jenkinsfile-gitlab

ci-scripts/conf_files/rcc.band7.tm1.nfapi.conf

ci-scripts/conf_files/ue.nfapi.conf

ci-scripts/oai-ci-vm-tool

ci-scripts/runTestOnVM.sh

cmake_targets/CMakeLists.txt

cmake_targets/build_oai

cmake_targets/tools/init_nas_s1

nfapi/oai_integration/nfapi_vnf.c

nfapi/open-nFAPI/pnf/src/pnf.c

nfapi/open-nFAPI/pnf/src/pnf_p7.c

nfapi/open-nFAPI/vnf/src/vnf_p7.c

openair1/PHY/defs_UE.h

openair2/COMMON/platform_constants.h

openair2/LAYER2/MAC/eNB_scheduler_RA.c

openair2/LAYER2/MAC/eNB_scheduler_fairRR.c

openair2/LAYER2/MAC/eNB_scheduler_primitives.c

openair2/LAYER2/MAC/mac_extern.h

openair2/LAYER2/MAC/mac_vars.h

openair2/LAYER2/MAC/main_ue.c