Mbst 9887 tva improvements

Add version/on-demand/broadcast id synthesis
Add service mapping
Add genre mapping
Pass masterbrand through to ServiceIDRef
Welcome to the delights of testing stuff. the commented out constant is what *should* be used, and the one being used is a test one, while YV figure out how they want to handle services. The comment is an indication that the test service is a temporary workaround.