merge
jiraId:MAR-542 fixed unit tests for scenario create
clean up merge