Issue #2700367 by alexpott: Consolidate miscellaneous docs from class @file docblocks into the class docblocks (part2) (cherry picked from commit 7358f7a4)