rabbitfixture

Merge proposals dependent on lp://staging/~cjwatson/rabbitfixture/ctl-dist-port

  1. ctl-dist-port
  2. Dependent merge proposals

lp://staging/~cjwatson/rabbitfixture/ctl-dist-port has no merge proposals.