[FIXED JENKINS-13125 JENKINS-20074]

Incorporated Stapler 1.222 to pick up fixes