Merge remote-tracking branch 'origin/1.5.2-SNAPSHOT' into 1.5.2-SNAPSHOT
ACCUMULO-2939 Add in the protobuf-java jar to the accumulo lib directory
ACCUMULO-2934 Use jetty 8 for Accumulo 1.6.x

  This patch drops Jetty back to version 8, for the 1.6.x branches, so that
  Accumulo can continue to run in Java 6. servlet-api drops back to 3.0.1 here,
  and jetty-continuation is added as a runtime dependency.

  A few small changes were made to the EmbeddedWebServer to use the
  SelectChannelConnector and its corresponding one for SSL, instead of the newer
  ServerConnector from Jetty 9.
Merge branch '1.6.1-SNAPSHOT'

  Merging ACCUMULO-2934 to master, with -sours, since that change
  only applies to 1.6.x
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'

Conflicts:
	test/src/test/java/org/apache/accumulo/fate/zookeeper/ZooLockTest.java
ACCUMULO-2935 Ensure test actually times out.
ACCUMULO-2941 Use a DefaultConfiguration instead of (unintentionally) hitting ZK