Merge branch 'master' into rpc

Conflicts:
	linux/ws_main.py
	linux_dpdk/ws_main.py

diff --cc linux/ws_main.py
index 659d492,505853b..e2364be
--- 1/linux/ws_main.py
--- 2/linux/ws_main.py
+++ b/linux/ws_main.py
@@@ -223,11 -221,11 +223,11 @@@ cxxflags_base =['-DWIN_UCODE_SIM'
  
  
  includes_path =''' ../src/pal/linux/
-                    ../src/zmq/include/
                     ../src/
 -                   ../src/rpc-server/include
 +                   ../src/rpc-server/
                     ../external_libs/json/
-                    ../yaml-cpp/include/
+                    ../external_libs/zmq/include/
+                    ../external_libs/yaml-cpp/include/
                ''';
  
  

diff --cc linux_dpdk/ws_main.py
index aa270e6,92364d7..24ffe18
--- 1/linux_dpdk/ws_main.py
--- 2/linux_dpdk/ws_main.py
+++ b/linux_dpdk/ws_main.py
@@@ -400,10 -398,13 +400,13 @@@ common_flags_old = common_flags + 
  
  includes_path =''' ../src/pal/linux_dpdk/
                     ../src/
-                    ../external_libs/json/
+                    
 -                   ../src/rpc-server/include
 +                   ../src/rpc-server/
-                    ../yaml-cpp/include/
-                    ../src/zmq/include/
+ 
+                    ../external_libs/yaml-cpp/include/
+                    ../external_libs/zmq/include/
+                    ../external_libs/json/
+ 
                          ../src/dpdk_lib18/librte_eal/linuxapp/eal/include/
                          ../src/dpdk_lib18/librte_eal/common/include/
                          ../src/dpdk_lib18/librte_eal/common/