Merge proposals dependent on lp://staging/~dobey/autopilot/fix-sphinx

lp://staging/~dobey/autopilot/fix-sphinx has no merge proposals.