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

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