Merge branch 'master' into dan_stateless

diff --cc scripts/automation/trex_control_plane/client_utils/outer_packages.py
index 81672c9,c489fd3..3ba73ec
--- 1/scripts/automation/trex_control_plane/client_utils/outer_packages.py
--- 2/scripts/automation/trex_control_plane/client_utils/outer_packages.py
+++ b/scripts/automation/trex_control_plane/client_utils/outer_packages.py
@@@ -6,12 -6,9 +6,11 @@@ import o
  
  CURRENT_PATH        = os.path.dirname(os.path.realpath(__file__))
  ROOT_PATH           = os.path.abspath(os.path.join(CURRENT_PATH, os.pardir))     # path to trex_control_plane directory
- PATH_TO_PYTHON_LIB  = os.path.abspath(os.path.join(ROOT_PATH, os.pardir, os.pardir,
-                                                    os.pardir, 'external_libs', 'python'))
+ PATH_TO_PYTHON_LIB  = os.path.abspath(os.path.join(ROOT_PATH, os.pardir, os.pardir, 'external_libs'))
  
 -CLIENT_UTILS_MODULES = ['zmq']
 +CLIENT_UTILS_MODULES = ['zmq',
 +                        'dpkt-1.8.6.2'
 +                        ]
  
  
  def import_client_utils_modules():