Merge proposals dependent on lp://staging/apparmor/2.5

lp://staging/apparmor/2.5 has no merge proposals.