the trunk is toward 1.558-SNAPSHOT
[JENKINS-21579] Copied as-is from Ant 1.8.3 to apply patches
[FIXED JENKINS-21579] UberClassLoader.findResources() improvements

This is just a locally patched version, so not meant to be used outside
core.
Merge remote-tracking branch 'origin/master'

Conflicts:
	changelog.html
Allow JDK8 to be downloaded. Left in other cookie for backwards compatability.
Update changelog.
Merge pull request #1165 from larrys/jdk8

Allow JDK8 to be downloaded. Left in other cookie for backwards compatab...
Update changelog to include JENKINS-22347 for retroactive ticket.
Revert "list-jobs should print names, not display names, since people expect to be able to feed the results into other CLI commands."

This reverts commit aaa50018eef14910eefc939b6fd4b0b9b0c6e0bd.
updated changelog for resolved download problems with pre-8 JDKs
Run.toString() should use internal, not display names, since it may be used in logging.
UI elements should explicitly ask for .fullDisplayName.
Fixing some misuses of Logger w.r.t. Run.toString.
Merge branch 'rc'

Conflicts:
	changelog.html
Yet more diagnostics for reported LogRotator failure on MavenModuleBuild.
Merge branch 'master' of git://github.com/jenkinsci/jenkins
[FIXED JENKINS-20500] Pass ${it} as an alias for ${view} to t:queue and t:executors, correcting regression introduced in 8e6a3f7.
Extending customizedFields support to f:number.
[FIXED JENKINS-21875]

User.current() can return null, so this better check for null
Merge REMERGE_HEAD into HEAD
[FIXED JENKINS-22382] Need to restore deprecated overload of BuildAuthorizationToken.checkPermission for binary compatibility.