Merge pull request #41537 from tianon/apparmor-tilde

Also trim "~..." from AppArmor versions