Tweak output based on output of diff scripts. Misc small changes.
Merge branch 'mbst-9893-more-granular-uploads' into stage

Conflicts:
	src/main/java/org/atlasapi/feeds/youview/nitro/NitroOnDemandLocationGenerator.java
	src/main/java/org/atlasapi/feeds/youview/nitro/NitroProgramInformationGenerator.java