Merge proposals dependent on lp://staging/~dobey/ubuntuone-client/update-2-0

lp://staging/~dobey/ubuntuone-client/update-2-0 has no merge proposals.