Sweeping !40035 from master to 21.2. fix ATLASG-1581, ATLASG-1580, minor cleanups to DiskWriterXRDCloses ATLASG-1581 and ATLASG-1580
fix ATLASG-1581, ATLASG-1580, minor cleanups to DiskWriterXRD
Closes ATLASG-1581 and ATLASG-1580
See merge request !40035 (merged)