Ensure consistency in content selection

Previously, the logic around which content to include
was separate and therefore could, and did, diverge.
Pulled it all together into one place, so a brand should
only appear in the index if there is appropriate content
to output in its sitemap.
Merge pull request #127 from atlasapi/sitemaps-filter-brands-without-content

Ensure consistency in content selection
SitemapOutputter now needs a Clock
Change publisher key used in lastupdated store as current key features '.'
Merge pull request #126 from atlasapi/mbst-9838-yv-process-improvements

Mbst 9838 yv process improvements
Minor tweaks following review - extraction of methods, plus throwing upon unexpected data when mapping genres.
Merge branch 'mbst-9990-be-actions'

Conflicts:
	src/main/java/org/atlasapi/feeds/youview/TVAnytimeFeedsModule.java
	src/main/java/org/atlasapi/feeds/youview/YouViewUploadModule.java
	src/main/java/org/atlasapi/feeds/youview/YouViewUploadTask.java
	src/main/java/org/atlasapi/feeds/youview/persistence/MongoYouViewLastUpdatedStore.java
	src/main/java/org/atlasapi/feeds/youview/tasks/TaskQuery.java
	src/main/java/org/atlasapi/feeds/youview/transactions/TransactionStatus.java
	src/main/java/org/atlasapi/feeds/youview/transactions/persistence/TransactionStatusTranslator.java
	src/test/java/org/atlasapi/feeds/youview/BootstrapIntegrationTest.java
	src/test/java/org/atlasapi/feeds/youview/DeltaIntegrationTest.java
	src/test/java/org/atlasapi/feeds/youview/YouViewLastUpdatedStoreTest.java
Resolve MasterBrand ID from Alias on channel rather than using Service ID, as the two, while similar, are not always the same.
Merge pull request #131 from atlasapi/bbc-master-brands

Bbc master brands