[apparmor] [Merge] lp:~intrigeri/apparmor/usrmerge into lp:apparmor

[intrigeri]

I've not noticed any issue with these changes on my production laptop. debfx also has tried r3599 and it didn't cause any problem for him either.
-- 
https://code.launchpad.net/~intrigeri/apparmor/usrmerge/+merge/312409
Your team AppArmor Developers is requested to review the proposed merge of lp:~intrigeri/apparmor/usrmerge into lp:apparmor.