Merge branch 'issue_30' into 'develop'

MR: Update osom for service state model change

See merge request !17