factored out issue updating code in preparation for JENKINS-24486