ACCUMULO-2826 Allow single CF for IntersectingIterator
ACCUMULO-3192 add -np to accumulo fate command
Merge branch '1.6'
Merge remote-tracking branch 'origin/1.6' into 1.6
Merge remote-tracking branch 'origin/master'
Merge branch '1.6'
ACCUMULO-2480 Remove unnecessary curly brackets from variable initialization
ACCUMULO-3194 Wait for more splits to happen before doing the verification and checking file distribution

If we only wait for 50 splits, we could get into a state where a tablet needs to split,
but hasn't yet done so, and thus would not fall within the expected number of files.
Merge branch '1.6'
ACCUMULO-3182 Ensures that a WAL with a partial header (or completely) empty can be successfully recovered.

In the case where a WAL is observed which has a partial or missing header,
the file is treated as "empty": no log entries will be attempted to be
read and replayed from it. This should restore the normaly functionality
that was observed with 1.5 WALs.

Integration test was introduced which tests that the introduction of
either an empty WAL or a WAL with a partial header does not block
recovery of the tablet which references the "bad" WAL.

Additionally, an enum was introduced to remove the use of hard-coded
WAL recovery status marker files: "finished" and "failed".
Merge branch '1.6'

Conflicts:
	server/tserver/src/main/java/org/apache/accumulo/tserver/TabletServer.java
	server/tserver/src/main/java/org/apache/accumulo/tserver/log/DfsLogger.java
	server/tserver/src/main/java/org/apache/accumulo/tserver/logger/LogReader.java
Merge branch '1.6' of https://git-wip-us.apache.org/repos/asf/accumulo into 1.6
ACCUMULO-3182 Attempt to fix bad merge
ACCUMULO-3182 Fix incorrect fix at bad merge.
ACCUMULO-3183 support loading compaction strategy from per table classpath
ACCUMULO-3189 add verification of compaction plan
Merge branch '1.6'

Conflicts:
	core/src/main/java/org/apache/accumulo/core/conf/Property.java
	server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/Tablet.java
ACCUMULO-3193 use a thread pool to jam more requests into the NN, which will hopefully compete better with the other NN requests
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/accumulo
ACCUMULO-3205 mark jceks files as binary for RAT checks.

jceks files are detected as binary on OS X, so rat check passes locally.
The current asf run jenkins box's ubuntu version doesn't think they're binary, so rat check fails.