import mismatches & self-import

Jiri Masikrequested to merge
jmasik/athena:python-Config-fixes into 23.0

match imports to the defs, remove a self-import

Merge request reports