[devel at bb.net] Mergeable Buildbot pull requests

[dustin at buildbot.net]

Mergeable pull requests:

https://github.com/buildbot/buildbot/pull/1995 - Improve format of configuration file syntax errors