Merge pull request #656 from dimagi/cz

set timeout on the right class
Revert ""update elastic case index to only delimit on whitespace by default"""

This reverts commit a9037ab161bff855af9dc92d2aa072dfb12f12c2.