Merge branch 'buck-modernize-test-db-buildrequests' into nine

Conflicts:
	master/buildbot/test/fake/fakedb.py
	master/buildbot/test/unit/test_db_buildrequests.py
fix the one failing test