Database docblock fixes
Merge pull request #5058 from GrahamCampbell/4.2-db

[4.2] Database Docblock Fixes