ignore springloaded javadoc jar file (if it exists) when generating wrapper
Merge branch '2.2.x'

Conflicts:
	scripts/Wrapper.groovy
ignore springloaded javadoc jar file (if it exists) when generating wrapper