Apparmor changes merged upstream

Switch to our master branch. Same commit ref.