JENKINS-20388 fixes after plugin update tests