Merge remote-tracking branch 'origin/1.5.2-SNAPSHOT' into 1.5.2-SNAPSHOT
ACCUMULO-2940 Add a Watcher to not use ZooKeeper before we're connected.

ZooKeeper connection is asynchronous, so we need to set a Watcher to know
when the client is actually connected. We should really be checking for connections
after any exception, but we hopefully won't get disconnected mid-test.
Merge branch '1.5.2-SNAPSHOT' into 1.6.1-SNAPSHOT

Conflicts:
	test/src/test/java/org/apache/accumulo/fate/zookeeper/ZooLockTest.java