Merge proposals dependent on lp:~mandel/desktopcouch/fix_bug_519873

lp:~mandel/desktopcouch/fix_bug_519873 has no merge proposals.