Fix additional missing API doc tags.
Make PHPCS build passing again.
Merge branch 'master' of github.com:cakephp/cakephp into master-cs-guidelines