Increase Cirrus pool counter for new servers

Also lower the timeout for updates.  If updates are waiting a long time
that is likely a symptom of a bigger problem and we need to know quickly
rather than wait.  Traffic isn't _that_ bursty.

Change-Id: I8959656dc77bdf8092dd58e5fc5b57a254d33e4e
Merge "Increase Cirrus pool counter for new servers"