Merge branch '1.4.5-SNAPSHOT' of https://git-wip-us.apache.org/repos/asf/accumulo into 1.4.5-SNAPSHOT
ACCUMULO-2369 Increase the sleep time and add some comments as to why
ACCUMULO-2361 IT to reproduce
Merge branch '1.5.1-SNAPSHOT' of https://git-wip-us.apache.org/repos/asf/accumulo into 1.5.1-SNAPSHOT
ACCUMULO-2361 clean-up: remove commented code
ACCUMULO-2361 clean-up at the end of the test
ACCUMULO-1961 fixing warnings
ACCUMULO-2378 Replace LOGNAME usage in TestUtils.py with getpass

When running functional tests under MapReduce, the LOGNAME environment variable is
not available. This change switches TestUtils.py to use getpass.getuser(), which
looks for a variety of environment variables to locate the current user, and which
works more reliably.
Merge branch '1.4.5-SNAPSHOT' into 1.5.1-SNAPSHOT
ACCUMULO-2379 Document running functional tests under MR as a different user

Functional tests might not run under MapReduce in clusters where a different user from
the Accumulo user runs mappers. Needed configuration changes are now documented in
the functional test README.
Merge branch '1.4.5-SNAPSHOT' into 1.5.1-SNAPSHOT

Conflicts:
	test/system/auto/README
ACCUMULO-2324 synchronize on plain old Object, and not a String
ACCUMULO-2385 fix error running test against hadoop 1.0
Merge branch '1.5.1-SNAPSHOT' of https://git-wip-us.apache.org/repos/asf/accumulo into 1.5.1-SNAPSHOT
ACCUMULO-2387 Use ACCUMULO_CONF_DIR to find config files in bootstrap_hdfs.sh

Signed-off-by: Eric Newton <eric.newton@gmail.com>
ACCUMULO-2380 Improve RunTests to produce useful mapper and job output

When passed the -m option, run.py for functional tests will emit one line on standard
output for each test that passes or fails. The output is suitable for processing when
tests are run within a mapreduce job.

The mapper for RunTests, which runs functional tests, is updated to pass -m to run.py.
It also inserts the map task attempt ID into the custom output, so that testers can trace
back any test to the task where it ran, to view its logs for example.

The mapper also now uses counters to track the number of successes, failures, errors, etc.
Note that since the job may attempt to re-run tests that error out, the total for these
counters can exceed the total number of unique tests run.
Merge branch '1.4.5-SNAPSHOT' into 1.5.1-SNAPSHOT

Conflicts:
	test/src/main/java/org/apache/accumulo/test/functional/RunTests.java
	test/system/auto/TestUtils.py
Revert "ACCUMULO-2170 Collapse down spacing and remove 1.5.0 changes."

This reverts commit a27f60b2e69c1df056ca6b1306017d93118d81f3.
ACCUMULO-2170 Re-fix the whitespace changes that I want.
ACCUMULO-2170 Update CHANGES with changes since 1.5.1-RC2