[apparmor] [Merge] ~intrigeri/apparmor-profiles/+git/apparmor-profiles:usrmerge into apparmor-profiles:master

[intrigeri]

Hi! Here's the "two weeks later" ping :)
-- 
https://code.launchpad.net/~intrigeri/apparmor-profiles/+git/apparmor-profiles/+merge/312411
Your team AppArmor Developers is requested to review the proposed merge of ~intrigeri/apparmor-profiles/+git/apparmor-profiles:usrmerge into apparmor-profiles:master.