Small cleanup in service.sh
Merge branch 'master' into drobofs