cs standard corrections for doc blocks
Merge pull request #3724 from dereuromark/3.0-cs-fixes

3.0 cs fixes