Adding a warning message for easier debugging.
Fixing a bug introduced by using new zkocc API.
Converting the remaining tests to unittest.
Fixing more tests.
Merge branch 'master' into resharding

Conflicts:
	test/update_stream.py