[devel at bb.net] Mergeable Buildbot pull requests

[dustin at buildbot.net]

Mergeable pull requests:

https://github.com/buildbot/buildbot/pull/2193 - Don't return deferreds twice when substantiating.
https://github.com/buildbot/buildbot/pull/2192 - Switched some properties tests to inline callbacks