Fix return errors.
More return type corrections.
More return fixes.
Merge pull request #5394 from cakephp/3.0-fixes

Fix return errors.