[4.2] Database Docblock Fixes

It's nice to have consistent docblocks.