tag tests as either PROD test or CODE test.
Merge branch 'master' into read-composer-draft-in-preview

Conflicts:
	src/test/scala/com.gu.contentapi.sanity/CanaryWritingSanityTest.scala
	src/test/scala/com.gu.contentapi.sanity/DraftR2ContentShouldAppearInPreviewTest.scala