Merge proposals dependent on lp://staging/~ken-vandine/ubuntu-push/fix_ftbfs

lp://staging/~ken-vandine/ubuntu-push/fix_ftbfs has no merge proposals.