Fix inflection when baking models.

Refs #5428, #5488
Merge pull request #5493 from cakephp/issue-5428

Fix inflection when baking models.