Resolve folder name conflicts in View

Completes https://github.com/cakephp/cakephp/pull/1642