[FIXED JENKINS-23107] Check to ensure that there is a build with a workspace available
Merge branch 'superdodd-master'
Merge branch 'master' into jenkins-23371