Extract clip availability fetch batch size constant
Improve handling of missing Nitro programmes
merge Clips on Content in ContentMerger
Set lastUpdated time on Nitro content
Extract mediaTypes for Nitro clips
Merge branch 'mbst-7010-nitro' into stage

* mbst-7010-nitro:
  Extract mediaTypes for Nitro clips
  Set lastUpdated time on Nitro content
  merge Clips on Content in ContentMerger
  Improve handling of missing Nitro programmes
  Extract clip availability fetch batch size constant

Conflicts:
	src/main/java/org/atlasapi/remotesite/bbc/nitro/extract/BaseNitroItemExtractor.java