Merge proposals dependent on lp:~dobey/ubuntuone-client-gnome/fix-983144

lp:~dobey/ubuntuone-client-gnome/fix-983144 has no merge proposals.