Merge proposals dependent on lp://staging/~adeuring/launchpad/bug-591323-slave-db-for-bug-searches

1. bug-591323-slave-db-for-bug-searches
2. Dependent merge proposals