update to resources 1.2
ignore sources and javadocs when generating wrapper
ignore springloaded javadoc jar file (if it exists) when generating wrapper
Merge branch '2.1.x' into 2.2.x
Merge branch '2.2.x'

Conflicts:
	gradle/assemble.gradle
	grails-resources/src/grails/grails-app/conf/BuildConfig.groovy