3.0 - Fix more doc blocks

Continuation of https://github.com/cakephp/cakephp/issues/2677.