Merge proposals dependent on lp://qastaging/~vds/desktopcouch/remove_delete_flag

lp://qastaging/~vds/desktopcouch/remove_delete_flag has no merge proposals.