Merge branch 'master' of git://github.com/nido/buildbot

+autopep8
Merge branch 'source-cvs-pass-timeout-to-rmdir' of git://github.com/jpommerening/buildbot
Merge branch 'fix-gerrit-step' of git://github.com/krf/buildbot
Force types on 'log-size' and 'log-count' arguments for "create-master" command

Previously these arguments were treated as string and passed as strings to
twisted.python.logfile.LogFile.fromFullPath() in buildbot.tac:

rotateLength = '10000000'
maxRotatedFiles = '10'


That led to invalid behaviour of Twisted logger - logs doesn't rotated at all.
Add tests to check correct 'log-size' and 'log-count' formatting
Check only for exception type when checking for Jinja error

Travis version on Jinja has "an integer is required" exception text,
lets not rely on it.
Fix broken scripts.runner tests
Add test for case when "log-count" is None
Remove unused import of 're' module

Strange that pyflakes reported about this only now:
<https://travis-ci.org/vrutsky/buildbot/jobs/14080064>
and doesn't report eralier, e.g.
<https://travis-ci.org/vrutsky/buildbot/jobs/14080076>,
with same pyflakes v0.7.3...
Remove test_describe_fail() and add tests for describe() on custom rendarables

_describe() checks with:

   try:
       len(words)
   except AttributeError:
       # WithProperties and Property don't have __len__
       return ["???"]

if passed command is some kind of rendarable, so describe() should never fail.

But this doesn't work for renderables which are instances of new-style
classes - add failing tests for that cases.
Fix _describe() when command is new-style class instance
Fix typos: "bulids", "stoppd", "superceded", "documentd"
Merge branch 'fix_custom_renderables_describe' of git://github.com/vrutsky/buildbot
Merge branch 'fix_create_master_log_params' of git://github.com/vrutsky/buildbot
Merge branch 'fix_typos' of git://github.com/vrutsky/buildbot
Merge branch 'master' into nine

Conflicts:
	master/buildbot/monkeypatches/__init__.py
	master/buildbot/process/buildstep.py
	master/buildbot/steps/source/cvs.py
	master/buildbot/test/unit/test_steps_trigger.py
update fiximports to fix more imports; apply universally
Fix imports on nine
Merge branch 'master' of git://github.com/tflink/buildbot

Conflicts:
	master/buildbot/test/unit/test_status_mail.py
plus autopep8
Merge branch 'bug2486' of git://github.com/rubocoptero/buildbot

Conflicts:
	master/buildbot/steps/shell.py