Merge branch '2.2' into 2.9

# Conflicts:
#	src/Console/Command/HelpCommand.php
#	src/Console/Command/ReadmeCommand.php
#	src/Fixer/LanguageConstruct/ClassKeywordRemoveFixer.php
#	tests/AutoReview/ProjectCodeTest.php
#	tests/Cache/FileHandlerTest.php
#	tests/CiIntegrationTest.php
#	tests/Fixer/Alias/NoAliasFunctionsFixerTest.php
#	tests/Fixer/ClassNotation/ProtectedToPrivateFixerTest.php
#	tests/Fixer/Import/SingleLineAfterImportsFixerTest.php
#	tests/Fixer/NamespaceNotation/BlankLineAfterNamespaceFixerTest.php
#	tests/Fixer/PhpTag/FullOpeningTagFixerTest.php
#	tests/Fixer/PhpUnit/PhpUnitStrictFixerTest.php