Merge commit 'f76e0102205b32a282a1dd8eb8abaee2eadf7b6e' into ninepep8fix
Merge commit 'ed8d49e2176a4f299a88805dced3b6fdb4c3c1d9' into ninepep8fix

Conflicts:
	master/buildbot/buildslave/base.py
	master/buildbot/changes/base.py
	master/buildbot/changes/bonsaipoller.py
	master/buildbot/changes/changes.py
	master/buildbot/changes/gerritchangesource.py
	master/buildbot/changes/gitpoller.py
	master/buildbot/changes/hgpoller.py
	master/buildbot/changes/manager.py
	master/buildbot/changes/p4poller.py
	master/buildbot/changes/pb.py
	master/buildbot/changes/svnpoller.py
	master/buildbot/config.py
	master/buildbot/data/exceptions.py
	master/buildbot/data/patches.py
	master/buildbot/db/base.py
	master/buildbot/db/buildrequests.py
	master/buildbot/db/builds.py
	master/buildbot/db/buildsets.py
	master/buildbot/db/buildslaves.py
	master/buildbot/db/changes.py
	master/buildbot/db/connector.py
	master/buildbot/db/migrate/versions/001_initial.py
	master/buildbot/db/model.py
	master/buildbot/db/schedulers.py
	master/buildbot/db/sourcestamps.py
	master/buildbot/interfaces.py
	master/buildbot/manhole.py
	master/buildbot/master.py
	master/buildbot/pbmanager.py
	master/buildbot/process/botmaster.py
	master/buildbot/process/build.py
	master/buildbot/process/builder.py
	master/buildbot/process/buildrequest.py
	master/buildbot/process/buildrequestdistributor.py
	master/buildbot/process/buildstep.py
	master/buildbot/process/cache.py
	master/buildbot/process/debug.py
	master/buildbot/process/metrics.py
	master/buildbot/process/slavebuilder.py
	master/buildbot/process/subunitlogobserver.py
	master/buildbot/process/users/manual.py
	master/buildbot/schedulers/base.py
	master/buildbot/schedulers/basic.py
	master/buildbot/schedulers/dependent.py
	master/buildbot/schedulers/forcesched.py
	master/buildbot/schedulers/timed.py
	master/buildbot/schedulers/triggerable.py
	master/buildbot/schedulers/trysched.py
	master/buildbot/scripts/create_master.py
	master/buildbot/scripts/runner.py
	master/buildbot/sourcestamp.py
	master/buildbot/status/base.py
	master/buildbot/status/build.py
	master/buildbot/status/builder.py
	master/buildbot/status/mail.py
	master/buildbot/status/master.py
	master/buildbot/status/persistent_queue.py
	master/buildbot/status/tinderbox.py
	master/buildbot/status/web/auth.py
	master/buildbot/status/web/authz.py
	master/buildbot/status/web/base.py
	master/buildbot/status/web/baseweb.py
	master/buildbot/status/web/build.py
	master/buildbot/status/web/builder.py
	master/buildbot/status/web/buildstatus.py
	master/buildbot/status/web/change_hook.py
	master/buildbot/status/web/changes.py
	master/buildbot/status/web/console.py
	master/buildbot/status/web/feeds.py
	master/buildbot/status/web/grid.py
	master/buildbot/status/web/logs.py
	master/buildbot/status/web/olpb.py
	master/buildbot/status/web/pngstatus.py
	master/buildbot/status/web/root.py
	master/buildbot/status/web/session.py
	master/buildbot/status/web/slaves.py
	master/buildbot/status/web/status_json.py
	master/buildbot/status/web/step.py
	master/buildbot/status/web/tests.py
	master/buildbot/status/web/users.py
	master/buildbot/status/web/waterfall.py
	master/buildbot/status/words.py
	master/buildbot/steps/package/deb/pbuilder.py
	master/buildbot/steps/package/rpm/mock.py
	master/buildbot/steps/shell.py
	master/buildbot/steps/slave.py
	master/buildbot/steps/source/base.py
	master/buildbot/steps/source/bzr.py
	master/buildbot/steps/source/cvs.py
	master/buildbot/steps/source/darcs.py
	master/buildbot/steps/source/git.py
	master/buildbot/steps/source/mercurial.py
	master/buildbot/steps/source/mtn.py
	master/buildbot/steps/source/svn.py
	master/buildbot/steps/subunit.py
	master/buildbot/steps/transfer.py
	master/buildbot/steps/trigger.py
	master/buildbot/test/__init__.py
	master/buildbot/test/fake/botmaster.py
	master/buildbot/test/fake/fakedb.py
	master/buildbot/test/fake/fakemaster.py
	master/buildbot/test/fake/pbmanager.py
	master/buildbot/test/fuzz/test_lru.py
	master/buildbot/test/integration/test_master.py
	master/buildbot/test/integration/test_slave_comm.py
	master/buildbot/test/integration/test_upgrade.py
	master/buildbot/test/regressions/test_bad_change_properties_rows.py
	master/buildbot/test/regressions/test_oldpaths.py
	master/buildbot/test/regressions/test_shell_command_properties.py
	master/buildbot/test/regressions/test_unpickling.py
	master/buildbot/test/test_extra_coverage.py
	master/buildbot/test/unit/test_buildslave_base.py
	master/buildbot/test/unit/test_changes_base.py
	master/buildbot/test/unit/test_changes_bonsaipoller.py
	master/buildbot/test/unit/test_changes_changes.py
	master/buildbot/test/unit/test_changes_gerritchangesource.py
	master/buildbot/test/unit/test_changes_gitpoller.py
	master/buildbot/test/unit/test_changes_hgpoller.py
	master/buildbot/test/unit/test_changes_manager.py
	master/buildbot/test/unit/test_changes_p4poller.py
	master/buildbot/test/unit/test_changes_pb.py
	master/buildbot/test/unit/test_changes_svnpoller.py
	master/buildbot/test/unit/test_config.py
	master/buildbot/test/unit/test_db_base.py
	master/buildbot/test/unit/test_db_buildrequests.py
	master/buildbot/test/unit/test_db_builds.py
	master/buildbot/test/unit/test_db_buildsets.py
	master/buildbot/test/unit/test_db_buildslaves.py
	master/buildbot/test/unit/test_db_changes.py
	master/buildbot/test/unit/test_db_connector.py
	master/buildbot/test/unit/test_db_schedulers.py
	master/buildbot/test/unit/test_db_sourcestamps.py
	master/buildbot/test/unit/test_db_sourcestampsets.py
	master/buildbot/test/unit/test_db_users.py
	master/buildbot/test/unit/test_master.py
	master/buildbot/test/unit/test_mq_simple.py
	master/buildbot/test/unit/test_process_botmaster_BotMaster.py
	master/buildbot/test/unit/test_process_botmaster_DuplicateSlaveArbitrator.py
	master/buildbot/test/unit/test_process_build.py
	master/buildbot/test/unit/test_process_builder.py
	master/buildbot/test/unit/test_process_buildrequest.py
	master/buildbot/test/unit/test_process_buildrequestdistributor_BuildRequestDistributor.py
	master/buildbot/test/unit/test_process_buildstep.py
	master/buildbot/test/unit/test_process_debug.py
	master/buildbot/test/unit/test_process_users_manager.py
	master/buildbot/test/unit/test_process_users_manual.py
	master/buildbot/test/unit/test_process_users_users.py
	master/buildbot/test/unit/test_remotecommand.py
	master/buildbot/test/unit/test_schedulers_base.py
	master/buildbot/test/unit/test_schedulers_basic.py
	master/buildbot/test/unit/test_schedulers_dependent.py
	master/buildbot/test/unit/test_schedulers_forcesched.py
	master/buildbot/test/unit/test_schedulers_timed_Nightly.py
	master/buildbot/test/unit/test_schedulers_timed_NightlyTriggerable.py
	master/buildbot/test/unit/test_schedulers_timed_Periodic.py
	master/buildbot/test/unit/test_schedulers_triggerable.py
	master/buildbot/test/unit/test_schedulers_trysched.py
	master/buildbot/test/unit/test_scripts_create_master.py
	master/buildbot/test/unit/test_scripts_upgrade_master.py
	master/buildbot/test/unit/test_sourcestamp.py
	master/buildbot/test/unit/test_status_build.py
	master/buildbot/test/unit/test_status_client.py
	master/buildbot/test/unit/test_status_logfile.py
	master/buildbot/test/unit/test_status_mail.py
	master/buildbot/test/unit/test_status_master.py
	master/buildbot/test/unit/test_status_web_auth_HTPasswdAprAuth.py
	master/buildbot/test/unit/test_status_web_auth_HTPasswdAuth.py
	master/buildbot/test/unit/test_status_web_authz_Authz.py
	master/buildbot/test/unit/test_status_web_base.py
	master/buildbot/test/unit/test_status_web_hook.py
	master/buildbot/test/unit/test_status_web_hooks_bitbucket.py
	master/buildbot/test/unit/test_status_web_hooks_github.py
	master/buildbot/test/unit/test_status_web_hooks_gitlab.py
	master/buildbot/test/unit/test_status_web_hooks_gitorious.py
	master/buildbot/test/unit/test_status_web_hooks_googlecode.py
	master/buildbot/test/unit/test_status_web_hooks_poller.py
	master/buildbot/test/unit/test_status_web_links.py
	master/buildbot/test/unit/test_status_web_statuspng.py
	master/buildbot/test/unit/test_steps_subunit.py
	master/buildbot/test/unit/test_steps_trigger.py
	master/buildbot/test/unit/test_util.py
	master/buildbot/test/unit/test_util_misc.py
	master/buildbot/test/util/change_import.py
	master/buildbot/test/util/changesource.py
	master/buildbot/test/util/interfaces.py
	master/buildbot/test/util/scheduler.py
	master/buildbot/test/util/steps.py
	master/buildbot/util/__init__.py
	master/buildbot/util/maildir.py
	master/buildbot/util/misc.py
	master/buildbot/util/sautils.py
	master/contrib/fakemaster.py
	master/contrib/fix_changes_pickle_encoding.py
	master/contrib/googlecode_atom.py
	master/docs/bbdocs/ext.py
	master/setup.py
re-auto-pep8

Signed-off-by: Pierre Tardy <pierre.tardy@intel.com>