GROOVY-6795: Add caching to MarkupTemplateEngine
GROOVY-6797: Provide custom template resolvers
GROOVY-6797: Fix missing class TemplateResolver
GROOVY-6126: CompileStatic: dispatch doesn't choose correct method when parameterized generic types are used

added non regression test
GROOVY-6358: @CompileStatic doesn't determine correct type for return from generic static method

added non regression test
GROOVY-6276: Fix private outer class method invocation target
GROOVY-6616: @CompileStatic Reference to constructor is ambiguous

added non regression tests
GROOVY-6276, part 2: Fix outer class property not visible if using getter
GROOVY-6258: groovydoc information loss when using generics
merge from master
GROOVY-6801: The AntlrParserPlugin format hook (-Dantlr.ast=format) is corrupted by jarjar (remove accidental commit of incorrect file)
[artifactory-release] Next development version
GROOVY-6806: Type checker should use the transform loader to load extension module methods
Fix typo in ClosureException
Fix typo in GDK Specification Documentation
GROOVY-6258: groovydoc information loss when using generics (handle multiple type args case)
GROOVY-6258: groovydoc information loss when using generics (handle slightly different AST for Java files)
GROOVY-6258: groovydoc information loss when using generics (better handling of type arguments and type parameters)
GROOVY-6775: GroovyDoc reports Exception: groovy.lang.ReadOnlyPropertyException: Cannot set readonly property: comparator for class: java.util.TreeMap
GROOVY-6258: groovydoc information loss when using generics (escape type angle brackets in index)