Merge branch '1.5.2-SNAPSHOT' into 1.6.1-SNAPSHOT

Conflicts:
	test/src/test/java/org/apache/accumulo/fate/zookeeper/ZooLockTest.java
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.