Simplification of return types. No need to return more mixed than necessary.
Merge pull request #5093 from cakephp/2.6-returns

Simplify return types.

Update code to use documented return types where possible, and reduce number of return types.