Merge proposals dependent on lp://staging/~ubuntu-security/apparmor-easyprof-ubuntu/1.3-stable-phone-overlay

1. 1.3-stable-phone-overlay
2. Dependent merge proposals