JENKINS-18885 and JENKINS-17855 fixing 404 URLs... round 2