update to latest trunk version (0.97-SNAPSHOT); cleanup zookeeper