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

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