Restore AppArmor generation + fixes Upstream-commit: d7661cb48b93978b4b30d2c60f3201d685af7f95 Component: engine