Fix E228
Merge branch 'e228' of git://github.com/ewongbb/buildbot
Merge branch 'master' into nine

Conflicts:
	master/buildbot/status/web/authz.py
	master/buildbot/status/web/builder.py
	master/buildbot/test/unit/test_process_buildrequestdistributor_BuildRequestDistributor.py