Fix bug in code generation which was preventing overriding the default behavior for enumerated properties.
Merge admin framework from config-prototype-branch onto trunk.