Merge proposals dependent on lp://qastaging/~robert-ancell/indicator-session/lockdown-settings-14.04

1. lockdown-settings-14.04
2. Dependent merge proposals