Merge proposals dependent on lp://qastaging/~mardy/ubuntu-system-settings/snapcraft-fix

lp://qastaging/~mardy/ubuntu-system-settings/snapcraft-fix has no merge proposals.