Merge remote-tracking branch...

Merge remote-tracking branch 'origin/nokia/contribution-omasa-combined-format-refactor-merge' into 644-add-omasa-self-test-cases