3.0 - [wip] Fix docblock errors found from apigen

Refs https://github.com/cakephp/cakephp/issues/2677