Try to fix flakiness by increasing timeouts, because that is always the best way to perform such a fix.
Merge pull request #1606 from lavalamp/fix

Try to fix flakiness by increasing timeouts
Improve replication controller errro handling.