Add some flags so we can work with phase II

Merged Ben Carlson requested to merge bcarlson/athena:April8-PhaseII into 21.9

Merge request reports