GROOVY-4485: enum does not support default map constructors (minor refactor)
Merge branch 'master' into rlw-jdk8