Start fixing docblock errors found from apigen
Merge pull request #2679 from bcrowe/3.0-checkstyle-errors

3.0 - [wip] Fix docblock errors found from apigen