cloud-init

Merge proposals dependent on lp://staging/~raharper/cloud-init/trunk.smartos-sdc-nics-fix

  1. trunk.smartos-sdc-nics-fix
  2. Dependent merge proposals

lp://staging/~raharper/cloud-init/trunk.smartos-sdc-nics-fix has no merge proposals.