Fixes #2486: renderables attribute is extended with 'haltOnFailture' and 'flunkOnFailture' in Configure class.
Revert changes to fix distracting whitespaces
renderables attribute extended in ShellCommand class
Merge branch 'bug2486' of git://github.com/rubocoptero/buildbot

Conflicts:
	master/buildbot/steps/shell.py