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

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