Standardize GroupId type and usage
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 'new-binlog-streamer'

Conflicts:
	go/vt/tabletserver/rowcache_invalidator.go
fix merge error: delete states
The grand purge: delete old binlog code
Fix vtgate bsonrpc close call
Fix tests after state var name change.

Submitting ric's change.
Merge branch 'master' into new-binlog-streamer
remove custom vt_mysqlbinlog from mysql
Merge branch 'master' of github.com:youtube/vitess
Merge branch 'fix-race-in-zk-dial'
Expose SqlQuery state.
Export QPS rates from the query engine.
Fix broken zkocc_test.