JENKINS-16855: Problem reported with PR seems to be related to
JENKINS-6687, reported fixed in 1.420 of jenkins, so I've moved the base
version forward to a LTS build after that point.