Merge proposals dependent on lp://staging/~allenap/launchpad/stop-checkwatches-hammering-bug-506158-db-stable

1. stop-checkwatches-hammering-bug-506158-db-stable
2. Dependent merge proposals