GROOVY-6560: Fix for escape URL in the JsonOutput (Windows path)
GROOVY-6560: Fix broken test for JsonOutput.toJson(URL)
Drop use of GenericsUtils.alignGenericsTypes for improved generics resolving

Conflicts:
	src/main/org/codehaus/groovy/transform/stc/StaticTypeCheckingVisitor.java