[artifactory-release] Next development version
minor refactor (clean up imports)
GROOVY-6929: Fix NPE with map constructor calls and setter only