Merge remote-tracking branch 'origin/closedown-4.0.x'

Signed-off-by: Richard Chapman <rchapman@hpccsystems.com>

common/fileview2/CMakeLists.txt

@@ -60,6 +60,7 @@ set (    SRCS
     )
 
 include_directories ( 
+         ${CMAKE_BINARY_DIR}
          ${CMAKE_BINARY_DIR}/oss
          ./../../system/mp 
          ./../../system/jhtree 

esp/services/ws_dfu/CMakeLists.txt

@@ -39,6 +39,7 @@ set (    SRCS
     )
 
 include_directories ( 
+         ${CMAKE_BINARY_DIR}
          ${CMAKE_BINARY_DIR}/oss
          ./../../../dali/dfu 
          ./../../../system/mp 

esp/services/ws_workunits/CMakeLists.txt

@@ -44,6 +44,7 @@ set (    SRCS
     )
 
 include_directories (
+         ${CMAKE_BINARY_DIR}
          ${CMAKE_BINARY_DIR}/oss
          ./../../esplib
          ./../../../system/mp