Unify irregular rules and simply code.
Merge pull request #4450 from cakephp/3.0-inflector

Unify irregular rules and simply code.