Fix JENKINS-21585 and JENKINS-18652
Upgrade Jenkins LTS