Merge proposals dependent on lp://qastaging/~mandel/desktopcouch/add_windows_keyring

lp://qastaging/~mandel/desktopcouch/add_windows_keyring has no merge proposals.