AthenaConfiguration: Fix missing imports in OldFlags2NewFlags

Fix missing imports in OldFlags2NewFlags and add a unit test.

Also increase the timeout for a test that was seen to be timing out in a debug build.