AthenaConfiguration: Remove Py2 code and fix logging calls

Remove the usage of six for Py2 compatibility, tidy up dict loops and comprehensions and fix all logging calls to use lazy string formatting.

Running this with full-unit-tests. Shifters, please compare failures to nightly build.