Consolidate with conditions sniff.
Merge pull request #5362 from cakephp/master-sniff

Consolidate with conditions sniff.