Sweeping !40035 from master to 21.2. fix ATLASG-1581, ATLASG-1580, minor cleanups to DiskWriterXRDCloses ATLASG-1581 and ATLASG-1580 (!40108) · Merge requests · atlas / athena · GitLab

Atlas Nightlybuild requested to merge cherry-pick-9a40addccf3-21.2 into 21.2 Jan 29, 2021

fix ATLASG-1581, ATLASG-1580, minor cleanups to DiskWriterXRD

Closes ATLASG-1581 and ATLASG-1580

See merge request !40035 (merged)