Merge proposals dependent on lp:~mikemc/cupstream2distro-config/add-ubuntuone-credentials

lp:~mikemc/cupstream2distro-config/add-ubuntuone-credentials has no merge proposals.