Mbst 9887 tva improvements

Add version/on-demand/broadcast id synthesis
Add service mapping
Add genre mapping
Pass masterbrand through to ServiceIDRef
Might be easier to read/verify if you just map types to values and then sort on that function.