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

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

fixes_OMASA_cleaning

See merge request !582