Merge proposals dependent on lp://staging/~dobey/ubuntuone-client/fix-570261-stable

lp://staging/~dobey/ubuntuone-client/fix-570261-stable has no merge proposals.