fix watchfile for apparmor
import, adopt, and upgrade apparmor -> 2.8.1
import and adopt augeas