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
version 2.1.6
Merge branch '2.1.x' into 2.2.x

Conflicts:
	build.gradle
	build.properties
	grails-test-suite-uber/src/test/groovy/grails/util/GrailsUtilTests.java
Merge branch '2.2.x'
fix compilation error
Merge branch 'master' of github.com:grails/grails-core
Fix ArrayStoreException in ForkedGrailsProcess
Merge branch '2.2.x'
Merge together DataBindingSource commits, minus Spring integration for
now
remove classes no longer used in the latest binding source work
rename SimpleMapBindingSource to SimpleMapDataBindingSource
minor code cleanup
GRAILS-10150 - remove JSONParsingParameterCreationListener
GRAILS-10150 - remove XMLParsingParameterCreationListener
make the JsonReader lenient
add array support to DefaultJsonDataBindingSourceHelper
fix failing tests
remove return statement