utils.setup().
Don't exit servers with a log.Fatal.
Implementing FakeZkOccConnection new API.
Now waiting for vttablet to exit, thanks Sugu!
Merge commit '5c84f804ace35af4e8df77c05dd30011c3f4fe8d'
Merge branch 'master' into resharding
Starightening the new zkocc API, using it now.
Fix logspam.
Merge branch 'master' of github.com:youtube/vitess
Add forgotten file.
Making loggin levels consistent in tests.
Merge branch 'master' into sougou-work

Conflicts:
	test/queryservice_tests/test_env.py
Merge commit '8e7842c56ee5fc5679e7484e2d3748a7f0443512'
Merge branch 'master' into sougou-work