IMP fixes to have clean run with out issue

Issue is clean stops the docker.service but does not appear to uninstall
`docker` still runs at cli but services are no longer present
`apt list --installed | grep docker ` lists following
```
docker-ce-cli/buster,now 5:20.10.6~3-0~raspbian-buster armhf [installed,automatic]
docker-ce-rootless-extras/buster,now 5:20.10.6~3-0~raspbian-buster armhf [installed,automatic]
docker-ce/buster,now 5:20.10.6~3-0~raspbian-buster armhf [installed]
docker-compose/stable,now 1.21.0-3 all [installed]
golang-docker-credential-helpers/stable,now 0.6.1-2 armhf [installed,automatic]
python3-docker/stable,now 3.4.1-4 all [installed]
python3-dockerpty/stable,now 0.4.1-1 all [installed,automatic]
python3-dockerpycreds/stable,now 0.3.0-1 all [installed,automatic]
```
compose does get uninstalled

Author: SLLau

docker/software/package/clean.sls

@@ -9,7 +9,7 @@
         {%- if grains.kernel|lower in ('linux',) %}
             {%- if d.pkg.docker.use_upstream == 'repo' %}
 include:
-  - .package.repo.clean
+  - .repo.clean
             {%- endif %}
 
 {{ formula }}-software-package-clean-pkg:
@@ -18,7 +18,7 @@ include:
     - reload_modules: {{ d.misc.reload|default(true, true) }}
             {%- if d.pkg.docker.use_upstream == 'repo' %}
     - require:
-      - pkgrepo: {{ formula }}-package-repo-absent
+      - pkgrepo: {{ formula }}-software-package-repo-absent
             {%- endif %}
 
         {%- elif grains.os_family == 'MacOS' %}