Merge proposals dependent on lp://staging/~ralsina/ubuntuone-client/fix_712674_on_1.4

lp://staging/~ralsina/ubuntuone-client/fix_712674_on_1.4 has no merge proposals.