Pushed the 2nd part of changes that updates how *.service files are generated
*.service
https://github.com/snapcore/snapd/pull/4357
