Gather builderid for builders
enforce builder names being unicode or ASCII
add 'mq' back to the list of allowed keys (merge error)
drop unneeded 'except AttributeError' statement

Catching AttributeError shadows handling of pb.NoSuchMethod exception.
This fixes pylnt error: 'E0701 (bad-except-order)'
Merge branch 'pylint-bad-except-order' of git://github.com/elmirjagudin/buildbot into nine
Merge branch 'master' into nine

Conflicts:
	master/buildbot/schedulers/base.py
	master/buildbot/scripts/runner.py
	master/buildbot/status/web/base.py
	master/buildbot/status/web/builder.py
	master/buildbot/status/web/status_json.py
	master/buildbot/test/test_extra_coverage.py
	master/buildbot/test/unit/test_status_web_hooks_gitorious.py
	master/buildbot/test/unit/test_status_web_hooks_googlecode.py
	master/buildbot/util/__init__.py
patch inlineCallbacks to preserve functions' argpsecs

(cherry-picked from nine)
Merge branch 'txrequests' of git://github.com/tardyp/buildbot
move RemoteCommand and friends to buildbot.process.remotecommand
move log observers to buildbot.process.logobserver
fix docs syntax
update docs and comments about global txrequests state
fix cancelAfter and its tests
remove cached state and fix up png tests
fix duplicate slave tests to wait for the correct detach to complete
Revert merging 'introduce-adapter of git://github.com/MichaelMayorov/buildbot".

This code isn't at the point where somebody could add a seperate protocol
without any core changes, yet.

This reverts commits 9f313d732025406e2cdfdf159d06d1441ed756d7,
aa89b68919034a4dc943291ea12d33ef4533cbbe, and
85fb85358df8974abe56d7beb369194a699f21c9.
Introducing adapter for PB
based on https://github.com/djmitche/buildbot/tree/amp
doKeepalive and shutdown moved to protocol level
minor fixes in test and getSlaveInfo
shutdown in old way moved to Protocol
Old and new ways moved under Protocol