Merge proposals dependent on lp:~canonical-platform-qa/qakit/fix_config

lp:~canonical-platform-qa/qakit/fix_config has no merge proposals.