GROOVY-7216: Add check to see if the key is in the original map
[artifactory-release] Next development version
GROOVY-7217: Fixed too optimistic addition of @CompileStatic annotation on trait initialization methods