Merge branch 'fix_comments_decode' of git://github.com/Ratio2/buildbot
Revert "Merge branch 'SlaveInfo' of git://github.com/jaredgrubb/buildbot"

This reverts commit 1c5973413aa3b7e5f2f197b488cd58206b7ac057, reversing
changes made to bf5c148e7b427c1f685ce846696a90ed2dc24704.

See https://github.com/buildbot/buildbot/pull/880 for details on why
this was reverted.

Conflicts:
	master/buildbot/status/slave.py
	master/docs/relnotes/index.rst
Merge branch 'master' into nine

Conflicts:
	master/buildbot/buildslave/base.py
	master/buildbot/changes/gerritchangesource.py
	master/buildbot/changes/gitpoller.py
	master/buildbot/process/buildstep.py
	master/buildbot/process/logobserver.py
	master/buildbot/process/remotecommand.py
	master/buildbot/status/master.py
	master/buildbot/status/web/baseweb.py
	master/buildbot/status/web/build.py
	master/buildbot/steps/source/base.py
	master/buildbot/test/unit/test_changes_gerritchangesource.py
	master/buildbot/test/unit/test_changes_hgpoller.py
	master/docs/relnotes/index.rst
add build.buildid, sl.buildslaveid, and st.stepid

This required a lot of refactoring of old tests.  It also required
changing the automatic generation of source step names to generate
proper identifiers.
Add more utility functions for identifiers
Add a 'slug' to logs, so that names can be non-identifiers

The 'newLog' update method takes care of generating a unique slug.
add build.buildid, sl.buildslaveid, and st.stepid

This required a lot of refactoring of old tests.  It also required
changing the automatic generation of source step names to generate
proper identifiers.
fix validation
set build status to 'finished' when finished
Use the process Log instance, rather than status

* change log.subscribe's signature to pass a callback that's called with
  different args; change LogObserver to correspond
* decode bytestrings to unicode as they are added to logs, using a
  default function
* step.addLog and friends return a process.log.Log instance
Add logEncoding config
rename db.rst to database.rst to correspond with master branch
restore 'gerritchangesource: use gerrit's changeid as the branch' (ccf6c117)
add buildbot.util.asyncSleep
Add an integration test for try scheduler client/server interactions.

This runs a full master with real builds.

Waiting for SSH builds does not work - the buildmaster returns buildset
ID's, while the client expects its external_idstring, so it waits
forever.  This functionality will be difficult to support as-is in nine,
so it's been removed.
Merge branch 'restore-gerrit-changeid-in-branch' of git://github.com/djmitche/buildbot (PR #1024)
Merge remote-tracking branch 'origin/8/try-integration-test' (PR #1026)

+autopep8
Merge branch 'master' into nine

Conflicts:
	master/buildbot/clients/tryclient.py
	master/buildbot/schedulers/trysched.py
	master/buildbot/test/unit/test_util.py
	master/buildbot/util/__init__.py
fix use of nonexistent getBuildsForRequest
Minor fixes to try scheduler and its integration tests