Merge proposals dependent on lp://staging/~rodrigo-moya/ubuntuone-client/fix-657850

lp://staging/~rodrigo-moya/ubuntuone-client/fix-657850 has no merge proposals.