Oops, sorry, one last problem - this test has the same name as the prevoius, and is slightly different (setDeactivateToReturn vs setUnclaimToReturn).  Unfortunately, the previous doesn't pass.

Can you check that, and also clean up whitespace in `master/buildbot/util/service.py` and in the docs?