Trying to make test pass after changing the progress bar to use a generated ID.
Also trying (without success) to diagnose an earlier local test failure.
Merge branch 'master' into lazy-build-lists-JENKINS-20892