AthAnalysis Fixes, master branch (2020.12.17.)

These are a couple of improvements for the tests run in the AthAnalysis project.

https://bigpanda.cern.ch/nview/?nightly=master_AthAnalysis_x86_64-centos7-gcc8-opt

Note that this is just scratching the surface at this point. We still have a lot of things to clean up in that project before it would be test-failure-free...

Control/AthenaConfiguration/python/AutoConfigFlags.py

 # Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 
 from PyUtils.MetaReader import read_metadata
-from AtlasGeoModel.AtlasGeoDBInterface import AtlasGeoDBInterface
 from AthenaCommon.Logging import logging
 from functools import lru_cache
 
@@ -33,6 +32,7 @@ def _initializeGeometryParameters(geoTag):
     from PixelGeoModel import PixelGeoDB
     from LArGeoAlgsNV import LArGeoDB
     from MuonGeoModel import MuonGeoDB
+    from AtlasGeoModel.AtlasGeoDBInterface import AtlasGeoDBInterface
 
     dbGeomCursor = AtlasGeoDBInterface(geoTag)
     dbGeomCursor.ConnectAndBrowseGeoDB()