Update codesniffer to remove travis errors.
Merge remote-tracking branch 'origin/3.5' into 3.6

Conflicts:
	dev/codesniffer/ruleset.xml