Mbst 9887 tva improvements

Add version/on-demand/broadcast id synthesis
Add service mapping
Add genre mapping
Pass masterbrand through to ServiceIDRef
Ah, good point. Will do so in the latest branch.