Mbst 9887 tva improvements

Add version/on-demand/broadcast id synthesis
Add service mapping
Add genre mapping
Pass masterbrand through to ServiceIDRef
Ah, true. Tbh, I'm hoping that much of this logic can go away/move elsewhere, but I may well refactor this ``Ordering``, as it's somewhat hideous right now.