Qual: Enhance PHPCS sheet.
Fix: More complete exclusion list
Fix: missing property
Merge remote-tracking branch 'origin/3.6' into develop

Conflicts:
	dev/codesniffer/ruleset.xml