Cleanup whitespace again
Fixed various docblocks
Add to doc block.
Merge pull request #5060 from GrahamCampbell/4.2-docs

[4.2] Fixed Various Docblocks
Merge pull request #5054 from GrahamCampbell/4.2-fixes

[4.2] Cleanup Whitespace Again
Merge.