Revert "Revert "More JSCS fixes""
with fix
Merge pull request #6827 from guardian/revert-6826-revert-6823-jscs-never-ends

Revert "Revert "More JSCS fixes""