Fixed some closure docblocks
Merge pull request #6822 from GrahamForks/5.0-cs

[5.0] CS Fixes And Minor Fixes