Further 6.6.0 fixes for Debian

When trying !56 (merged) and rebasing Ubuntu onto it I identified a few changes that make sense for Debian as well.

Furthermore when upstreaming apparmor changes on request of @abologna the abstraction/nameservice was identified to be too-much - so I removed it in a commit.

This applies cleanly on top of debian/sid but is meant to (upload wise) go along !56 (merged) and still applies after !56 (merged) is merged.