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

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