[FIXED JENKINS-14336]

Integrating the stapler fix.

(cherry picked from commit 02e00449e412fa3d18d9c4a04a670eaad899ec91)

Conflicts:
	changelog.html
	core/pom.xml