Fix some problems with custom services

The Dispatcher fix seems to take care of the problems in test_master uncovered in [TRAC-3081](http://trac.buildbot.net/ticket/3081#comment:20), although likely not the original bug.