Merge proposals dependent on lp://staging/~allenap/launchpad/checkwatches-bulk-reload-bug-572211

1. checkwatches-bulk-reload-bug-572211
2. Dependent merge proposals