Migrated Configuration/Common code for managing enumeraitons to Configuration/Enumerations, and otehr small cleanups due to this and related recent changes