Merge proposals dependent on lp://qastaging/~albertomilone/jockey/tseliot-fixes

lp://qastaging/~albertomilone/jockey/tseliot-fixes has no merge proposals.