Sweeping !21257 from 21.3 to 21.9. Sweeping !21226 from master to 21.3.Additional fixes for ATLASDQ-508 (!21320) · Merge requests · atlas / athena · GitLab

Atlas Nightlybuild requested to merge cherry-pick-40723336eb-21.9 into 21.9 Feb 21, 2019

Sweeping !21226 (merged) from master to 21.3. Additional fixes for ATLASDQ-508

See merge request !21257 (merged)