NPE.
I get random failures running this test against Jenkins 1.567, possibly timing-related. Skipping until these can be sorted out.
Merge branch 'master' into SCM-Job
All tests now passing.