Issue #2242361 by drunken monkey: Code cleanup, thirteenth batch.
Merge branch 'master' into 2349435-seperate-processors-by-stage

Conflicts:
	src/Tests/IntegrationTest.php
	src/Tests/Processor/ContentAccessTest.php
	src/Tests/Processor/ProcessorTestBase.php