APT

Merge proposals dependent on lp://qastaging/~tspindler/apt/zzapt+rsh-option-fix

  1. zzapt+rsh-option-fix
  2. Dependent merge proposals

lp://qastaging/~tspindler/apt/zzapt+rsh-option-fix has no merge proposals.