[JENKINS-24380] Updated to handle proposed new build directory format.
Merge remote-tracking branch 'origin/master' into build-number-is-id-JENKINS-24380
Merge pull request #13 from jglick/build-number-is-id-JENKINS-24380

Support new build format