Fix tests after state var name change.
Fix race condition in ZK connection cache by adding a timeout.

ConnCache.Close needs to lock a ZK connections, but
ConnCache.ConnForPath may be holding the mutex and trying to dial
forever.
Merge branch 'master' into fix-race-in-zk-dial
Merge branch 'master' of github.com:youtube/vitess
Merge branch 'fix-race-in-zk-dial'