Merge proposals dependent on lp://qastaging/~haakan/do-plugins/sshfix

lp://qastaging/~haakan/do-plugins/sshfix has no merge proposals.