Merge proposals dependent on lp://qastaging/~thisfred/desktopcouch/fix-deletion-migration-view

1. fix-deletion-migration-view
2. Dependent merge proposals