Updating JS colour to be a little softer
Merge pull request #1135 from github/js-colour-update

Updating JS colour to be a little softer
moved Mercury vendor test to generated test, as this fits better
Merge remote-tracking branch 'upstream/master' into fix-mercury-vendor-dirs