Master conventions docblocks

Docs update for conventions
See https://github.com/cakephp/cakephp/issues/3307