ACCUMULO-2939 Add in the protobuf-java jar to the accumulo lib directory

Conflicts:
	assemble/pom.xml
	assemble/src/main/assemblies/component.xml
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.

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