ACCUMULO-2826 Allow single CF for IntersectingIterator
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.
Merge branch '1.6'
ACCUMULO-3146 Also give the tserver a bit more heap to make sure the tserver doesn't die.
Merge branch '1.6'
ACCUMULO-3200 Remove unused class
ACCUMULO-3203 Remove unused class
Merge branch '1.6'
ACCUMULO-3031 Conditionally ignore known-bad test due to JDK bug

  Skip test execution when building on a known bad JDK version in the range
  (1.7.0_60, 1.7.0_72). This bug is expected to be fixed in 1.7.0_72.
ACCUMULO-3204 Remove old, unused classes
Merge remote-tracking branch 'ryanleary/ACCUMULO-2826' into 1.6
Merge branch '1.6'
ACCUMULO-3182 Fix javadoc (link to non-visible member)
Merge branch '1.6'
ACCUMULO-3212 Do not load defaults into new Configuration objects for CredentialProvider

Formatter fixed up some non-complaint whitespace too.
Merge branch '1.6'

Conflicts:
	core/src/main/java/org/apache/accumulo/core/conf/SiteConfiguration.java
ACCUMULO-3213 Instead of trying to start 100 threads at once, do 16 at a time

Previously would have been about 50 add splits and 50 delete tables at a time,
this brings it back to 8 and 8, but leaves the same total number of requests
about equal.
Merge branch '1.6'