Cleaning up CS fixer
Fixing checks - was failing also with no CS failures
CS fixes to make builds pass
Merge pull request #4269 from Ocramius/hotfix/cs-fixer-check

Hotfix: cs fixer check
[#4269] CS fixes

- EOF marker
Merge branch 'hotfix/4269'

Close #4269