Merge proposals dependent on lp://qastaging/~apparmor-dev/apparmor/apparmor-ubuntu-citrain.lp1295816

1. apparmor-ubuntu-citrain.lp1295816
2. Dependent merge proposals