3.0 - Additional ApiGen error fixes

Part 3 of https://github.com/cakephp/cakephp/issues/2677.