Revert "Merge branch '751-fire-sigterm-before-sigkill' of git://github.com/markberger/buildbot"

This reverts commit a577c74ae29e3098f494994c683b2ccf9c54eeba, reversing
changes made to 4a6c106dacb1734c2a234dcc159ecce476a9a29b.