unity: code review fixes
unity: unify common service launching code