Master conventions docblocks

Docs update for conventions
See https://github.com/cakephp/cakephp/issues/3307

I will then address the core doc blocks after the new convention is merged and settled.
Should this be done for master then first?