Add js error logging to diagnostics
Merge branch 'master' into diagnostics-errors

Conflicts:
	common/app/conf/switches.scala
Merge pull request #2863 from guardian/diagnostics-errors

Diagnostics errors