Merge proposals dependent on lp:~mandel/ubuntuone-dev-tools/fix-setup

lp:~mandel/ubuntuone-dev-tools/fix-setup has no merge proposals.