ACCUMULO-2234 Provide accumulo-site.xml to Mapper classpath and ensure is used by concrete Instance.
Merge branch '1.4.5-SNAPSHOT' into 1.5.1-SNAPSHOT

Conflicts:
	core/src/main/java/org/apache/accumulo/core/client/mapreduce/RangeInputSplit.java
	src/core/src/main/java/org/apache/accumulo/core/client/mapreduce/InputFormatBase.java
	test/src/main/java/org/apache/accumulo/test/continuous/ContinuousVerify.java
	test/system/continuous/run-verify.sh
Merge branch '1.5.1-SNAPSHOT' into 1.6.0-SNAPSHOT

Conflicts:
	core/src/main/java/org/apache/accumulo/core/client/mapreduce/RangeInputSplit.java
	core/src/main/java/org/apache/accumulo/core/client/mapreduce/lib/util/ConfiguratorBase.java
ACCUMULO-2213 Make writer recovery in the Tracer more robust.

    * Cleans up writer reseting in the TraceServer, avoids overly broad catching.
    * tones down log levels in TraceServer to WARN because trace information is transient and we retry everything.
ACCUMULO-2235 Make the du shell command successful when not in a table context.
Merge branch '1.5.1-SNAPSHOT' into 1.6.0-SNAPSHOT

Conflicts:
	core/src/main/java/org/apache/accumulo/core/util/shell/commands/DUCommand.java
ACCUMULO-2224 Make ZooSession more resiliant in the face of transient DNS issues.

* retries if host is not found, up to 2xZK timeout (same as other IOExceptions), rather than bailing on any host name problem.
* adds utility method for getting the max time the JVM will cache host failures
* add test for said method
ACCUMULO-2225 handle IllegalArgumentExceptions from Hadoop on host lookup failure.

Looks for cases where we treat IOExceptions out of Hadoop specially, then attempts to replicate for UnknownHostExceptions that have been wrapped in IllegalArgumentExceptions.
Merge branch '1.4.5-SNAPSHOT' into 1.5.1-SNAPSHOT

Moved the lookup of the ttl on DNS failure caching into fate, since ZooSession needs it and moved there.

Conflicts:
	fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooSession.java
	server/src/main/java/org/apache/accumulo/server/Accumulo.java
	server/src/main/java/org/apache/accumulo/server/trace/TraceServer.java
	test/src/main/java/org/apache/accumulo/test/randomwalk/security/SecurityHelper.java
Merge branch '1.5.1-SNAPSHOT' into 1.6.0-SNAPSHOT

Conflicts:
	core/src/main/java/org/apache/accumulo/core/client/ZooKeeperInstance.java
	core/src/main/java/org/apache/accumulo/core/util/AddressUtil.java
	fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooSession.java
	server/base/src/main/java/org/apache/accumulo/server/Accumulo.java
	server/master/src/main/java/org/apache/accumulo/master/tableOps/DeleteTable.java
	server/tracer/src/main/java/org/apache/accumulo/tracer/TraceServer.java
ACCUMULO-2224 link TODOs to new JIRAs
Merge branch '1.4.5-SNAPSHOT' into 1.5.1-SNAPSHOT
Merge branch '1.5.1-SNAPSHOT' into 1.6.0-SNAPSHOT
ACCUMULO-2154 Ignore NoNodeException while getting DeadServerList

Signed-off-by: Keith Turner <kturner@apache.org>
ACCUMULO-2183 Look for the thrift SecurityErrorCode since this is coming from the ThriftSecurityException.
ACCUMULO-2234 Fix up formatting for madrob.
ACCUMULO-2235 Fix up formatter for madrob and make the du test a little less sensitive to other tests
Merge branch '1.4.5-SNAPSHOT' into 1.5.1-SNAPSHOT

Conflicts:
	src/core/src/main/java/org/apache/accumulo/core/client/mapreduce/InputFormatBase.java
	test/src/main/java/org/apache/accumulo/test/continuous/ContinuousVerify.java
Merge branch '1.5.1-SNAPSHOT' into 1.6.0-SNAPSHOT

Conflicts:
	core/src/main/java/org/apache/accumulo/core/client/mapreduce/RangeInputSplit.java
	core/src/main/java/org/apache/accumulo/core/util/shell/commands/DUCommand.java
	test/src/main/java/org/apache/accumulo/test/continuous/ContinuousVerify.java
	test/src/test/java/org/apache/accumulo/test/ShellServerIT.java
Revert "ACCUMULO-2234 Provide accumulo-site.xml to Mapper classpath and ensure is used by concrete Instance."

This reverts commit 57f9b6cfd30b1b2505efbacd2a5ce391dbcd1e0c.

Conflicts:
	src/core/src/main/java/org/apache/accumulo/core/client/mapreduce/InputFormatBase.java
	src/server/src/main/java/org/apache/accumulo/server/test/continuous/ContinuousVerify.java