Sweeping !20683 from 21.1 to master. Merge branch '21.3-fix_nightly_test_file' into '21.3' (!21087) · Merge requests · atlas / athena · GitLab

Atlas Nightlybuild requested to merge cherry-pick-9660510f1b-master into master Feb 13, 2019

Merge branch '21.3-fix_nightly_test_file' into '21.3'

See merge request !20683 (merged)