Fixed bug #20322 : Display rules set to type=error even when suppressing warnings
Removed unused code and added TRAIT support (see bug #20307)
Merge branch 'master' into phpcs-fixer

Conflicts:
	CodeSniffer/File.php
	CodeSniffer/Standards/Squiz/Sniffs/NamingConventions/ValidVariableNameSniff.php