Generic ScopeIndentSniff now accounts for different open tag indents
Merge branch 'master' into phpcs-fixer

Conflicts:
	package.xml
Merge branch 'phpcs-fixer' of https://github.com/squizlabs/PHP_CodeSniffer into phpcs-fixer