Improved indented PHP tag support in Generic ScopeIndentSniff
Merge branch 'master' into phpcs-fixer

Conflicts:
	CodeSniffer/Standards/Generic/Tests/WhiteSpace/ScopeIndentUnitTest.inc
	CodeSniffer/Standards/Generic/Tests/WhiteSpace/ScopeIndentUnitTest.php