Merge branch 'clidsvc.ByteStreamCnvSvcBase-20180929' into 'master'

ByteStreamCnvSvcBase: CLIDSvc -> AthenaKernel

See merge request atlas/athena!14614

Event/ByteStreamCnvSvcBase/ByteStreamCnvSvcBase/CollectionByteStreamCnv.icc

@@ -13,7 +13,7 @@
 #include "GaudiKernel/IToolSvc.h"
 
 #include "StoreGate/StoreGateSvc.h"
-#include "CLIDSvc/CLASS_DEF.h"
+#include "AthenaKernel/CLASS_DEF.h"
 #include <algorithm>
 
 template< typename TOOL> 

Event/ByteStreamCnvSvcBase/CMakeLists.txt

@@ -9,7 +9,6 @@ atlas_subdir( ByteStreamCnvSvcBase )
 atlas_depends_on_subdirs( PUBLIC
                           Control/AthenaBaseComps
                           Control/AthenaKernel
-                          Control/CLIDSvc
                           Control/StoreGate
                           Event/ByteStreamData
                           GaudiKernel