Merge branch 'master-cluster-rio' into 'master'

...ker/TrackerEventCnv/TrackerEventAthenaPool/CMakeLists.txt

...TrackerEventCnv/TrackerEventAthenaPool/src/TrackerTrack.h

...erEventCnv/TrackerEventAthenaPool/src/TrackerTrackCnv.cxx

...ckerEventCnv/TrackerEventAthenaPool/src/TrackerTrackCnv.h

Tracker/TrackerEventCnv/TrackerEventCnvTools/CMakeLists.txt

...ntCnvTools/TrackerEventCnvTools/ATLAS_CHECK_THREAD_SAFETY

...rEventCnvTools/TrackerEventCnvTools/TrackerEventCnvTool.h

...EventCnv/TrackerEventCnvTools/src/TrackerEventCnvTool.cxx

...ntCnvTools/src/components/TrackerEventCnvTool_entries.cxx

Tracker/TrackerEventCnv/TrackerEventTPCnv/CMakeLists.txt

...ackerEventTPCnv/TrackerEventTPCnv/TrackerEventTPCnvDict.h

...tTPCnv/TrackerRIO_OnTrack/FaserSCT_ClusterOnTrackCnv_p2.h

...ventTPCnv/TrackerRIO_OnTrack/FaserSCT_ClusterOnTrack_p2.h

...kerEventTPCnv/TrackerRIO_OnTrack/SiClusterOnTrackCnv_p1.h

...rackerEventTPCnv/TrackerRIO_OnTrack/SiClusterOnTrack_p1.h

...rackerEventTPCnv/TrackerEventTPCnv/TrackerTrackCnv_tlp2.h

...v/TrackerEventTPCnv/TrackerEventTPCnv/TrackerTrack_tlp2.h

...ventCnv/TrackerEventTPCnv/TrackerEventTPCnv/selection.xml

.../src/TrackerRIO_OnTrack/FaserSCT_ClusterOnTrackCnv_p2.cxx

...ntTPCnv/src/TrackerRIO_OnTrack/SiClusterOnTrackCnv_p1.cxx