bugzid 3383: delete service if error occurs on server launch
Merge remote-tracking branch 'upstream/develop' into develop
Merge pull request #17 from daniellemayne/develop

bugzid 3383: delete service if error occurs on server launch (develop)