Merge proposals dependent on lp://qastaging/jockey

lp://qastaging/jockey has no merge proposals.