Fixed bug #20373 : Inline comment sniff tab handling way
Merge branch 'master' into phpcs-fixer

Conflicts:
	package.xml