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



git-svn-id: https://svn.apache.org/repos/asf/zookeeper/branches/branch-3.4@1552447 13f79535-47bb-0310-9956-ffa450edef68