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' into 1.6.1-SNAPSHOT

Conflicts:
	test/src/test/java/org/apache/accumulo/fate/zookeeper/ZooLockTest.java
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
ACCUMULO-2501 Add deepCopy to RowFilter

Adds a base implementation of deepCopy to org.apache.accumulo.core.iterators.user.RowFilter which sets the iterator source and decisionIterator prope This allows custom RowFilters to be chained together with minimal extra effort.

Signed-off-by: Josh Elser <elserj@apache.org>
ACCUMULO-2501 Fix some formatting and add an explicit test for deepCopy on RowFilter
Merge branch '1.5.2-SNAPSHOT' into 1.6.1-SNAPSHOT

Conflicts:
	core/src/test/java/org/apache/accumulo/core/iterators/user/RowFilterTest.java
Merge branch '1.6.1-SNAPSHOT'
ACCUMULO-2948 Use an AtomicInteger to any worry from multiple threads access pdCount concurrently.
Merge branch '1.5.2-SNAPSHOT' into 1.6.1-SNAPSHOT

Conflicts:
	test/src/test/java/org/apache/accumulo/fate/zookeeper/ZooLockTest.java
Merge branch '1.6.1-SNAPSHOT'
ACCUMULO-2913 If we compact the table(s) it's possible that the replication entry will be cleaned up.

For either table, if we compact them after writing the data, the tablet will remove its WAL entry.
When no tablets reference that WAL anymore, it will be closed by the GC. Thus, the master might
remove the closed entry, but out test case might not have been able to read the metadata table
to verify that the record was there.

By not compacting the tables, we can ensure that the record will definitely be there.
ACCUMULO-2849 Add scanner batch size and write delay configurability to mem stress test

This commit adds one new option each to the Scan and Write components of the memory
stress test. The --scan-batch-size option for Scan configures the batch size of the
scanner it uses, while the --write-delay option for Write allows for a delay between
each mutation added to its batch writer. The reader.sh and writer.sh scripts are
updated for easy configuration of these new options.
ACCUMULO-2908 use batch scanner opts when parsing
Merge branch '1.6.1-SNAPSHOT'