Add preview checks to troubleshooter
Merge branch 'master' into preview-troubleshooter

Conflicts:
	common/app/conf/application.scala
Merge branch 'master' into preview-troubleshooter
Merge pull request #7498 from guardian/preview-troubleshooter

Preview troubleshooter