Tidy up loader and common requires and config param
Merge pull request #6243 from guardian/common-js-tidy

Tidy up loader and common requires and config param