For timeouts include the command being run in the failure string
Merge edmorley/buildbot:master (PR #1130)