Ubuntu system image

Merge proposals dependent on lp://qastaging/~cjwatson/ubuntu-system-image/cdimage-custom

  1. cdimage-custom
  2. Dependent merge proposals

lp://qastaging/~cjwatson/ubuntu-system-image/cdimage-custom has no merge proposals.