Normalize key in modelFor when a factory is not given.
Merge pull request #1607 from abuiles/normalize-key

Normalize key in modelFor when a factory is not given.