Merge remote-tracking branch 'origin/282-flags-cleanup' into develop_integration_2018_w04

Conflicts:
	openair1/PHY/LTE_TRANSPORT/ulsch_decoding.c
	openair1/SCHED/defs.h
	openair2/LAYER2/PDCP_v10.1.0/pdcp.c
	openair2/RRC/LITE/rrc_eNB.c

openair3/S1AP/s1ap_eNB.c

@@ -65,10 +65,7 @@
 #include "oaisim_mme_test_s1c.h"
 #endif
 
-
-#if !defined(OAI_EMU)
 s1ap_eNB_config_t s1ap_config;
-#endif
 
 static int s1ap_eNB_generate_s1_setup_request(
   s1ap_eNB_instance_t *instance_p, s1ap_eNB_mme_data_t *s1ap_mme_data_p);