[JENKINS-17713] [FIXED JENKINS-14362] These fixes were (mistakenly?) recorded for 1.518 rather than for trunk.