ZOOKEEPER-1849. Need to properly tear down tests in various cases
  (Germán Blanco via fpj)



git-svn-id: https://svn.apache.org/repos/asf/zookeeper/trunk@1552946 13f79535-47bb-0310-9956-ffa450edef68