Fixes #7373 - fix service stopping and removing before uninstall