Correct doc block return types.
Wording correction.
Merge pull request #5084 from cakephp/master-docblock-return

Correct doc block return types.
Merge branch 'master' into 2.6