Filter bulider's slavenames when reconfiguring

Fixes #2507.  Note that a build which has its builder/slave pair removed
whlie it is executing will still hang indefinitely, but that's a much
larger problem.

@tomprince, I assume you'll want this in 0.8.8, so I've based in there.  Please merge if you like.