ACCUMULO-2438 Rename the test so that surefire doesn't pick it up as a unit test
ACCUMULO-2061 Fix up ServerConstants and make ChangeSecret reset the instanceId on all Volumes
ACCUMULO-2061 Fix FileUtil
ACCUMULO-2061 Fix the rest of server-base
ACCUMULO-2441 outline the file prefix conventions
ACCUMULO-2061 Get all of the unit tests running successfully
ACCUMULO-2438 Backport the changes to ensure that we watch separate sets of tables for merges
Merge branch '1.5.2-SNAPSHOT' into 1.6.0-SNAPSHOT

Conflicts:
	server/src/main/java/org/apache/accumulo/server/master/Master.java
ACCUMULO-2005: Add a 3rd argument to functional test RunTests.java to allow a timeout factor for mapred.task.timeout and run.py -f flag

Signed-off-by: Sean Busbey <busbey@cloudera.com>
Merge branch '1.4.5-SNAPSHOT' into 1.5.2-SNAPSHOT

-sours merge, 1.5.x specific changes in follow on patch.
ACCUMULO-2005: Add a 3rd argument to functional test RunTests.java to allow a timeout factor for mapred.task.timeout and run.py -f flag

(reimplemented for 1.5.x branch)

Signed-off-by: Sean Busbey <busbey@cloudera.com>
Merge branch '1.5.2-SNAPSHOT' into 1.6.0-SNAPSHOT

Delete conflicts; functional tests moved to ITs.

Conflicts:
	test/src/main/java/org/apache/accumulo/test/functional/RunTests.java
	test/system/auto/README
ACCUMULO-2447 Always set PrintWriter on Shell and don't print to stderr.

While we don't have access to the printwriter/outputstream from the jline
ConsoleReader, we can force the user to pass in one (or just make one for
stdout). This will allow unit tests to correctly squash all output into
a bytearray (or similar) instead of having to redirect stderr too (which
would have other repercussions).
ACCUMULO-1936 Make testInstanceOperations a more reliable test.

Avoid pulling scans for users other than root and compactions for
compactions over tables other than the one we're looking at. Slow down
the slow iterator even more.
ACCUMULO-2433 Add a way to still use the exec methods but provide a custom error message on failure.

Fix some tests that I've seen fail to provide better messages on failure to help future debugging
because I can't get them reproduced locally in any reasonable timeframe.
Merge branch '1.5.2-SNAPSHOT' into 1.6.0-SNAPSHOT

Conflicts:
	core/src/main/java/org/apache/accumulo/core/util/shell/Shell.java
	core/src/test/java/org/apache/accumulo/core/util/shell/ShellTest.java
	proxy/src/test/java/org/apache/accumulo/proxy/SimpleProxyIT.java
	test/src/test/java/org/apache/accumulo/test/ShellServerIT.java
Merge remote-tracking branch 'origin/1.6.0-SNAPSHOT' into ACCUMULO-2061
ACCUMULO-2061 Don't store the defaultVolume in with the rest but expect it in the constructor.
ACCUMULO-2061 Remove implicit assumptions about '/accumulo' directory that all volumes would have.

Added some extra logging at trace to help if this needs to be revisited.
ACCUMULO-2061 Don't use the default volume, use one of the "real" volumes.