Unsubscribe from watched builders during stop so reconfigure works correctly
Merge branch 'fix_status2' of git://github.com/jamie-cyber1/buildbot