Sweeping !40767 from 21.2 to master. AnalysisTop: Prepare more configuration sanity checks

Atlas Nightlybuildrequested to merge
cherry-pick-37f7dc2507c-master into master

AnalysisTop: Prepare more configuration sanity checks

See merge request !40767 (merged)

Merge request reports