Merge branch 'va/contribution-omasa-combined-format-fixes02' into...

Merge branch 'va/contribution-omasa-combined-format-fixes02' into 'nokia/contribution-omasa-combined-format'

fixes to OMASA BR switching

See merge request !593