Merge branch '1.4.5-SNAPSHOT' of https://git-wip-us.apache.org/repos/asf/accumulo into 1.4.5-SNAPSHOT
ACCUMULO-2361 clean-up: remove commented code
ACCUMULO-2361 integration test should be int src/test/java
ACCUMULO-2361 clean-up at the end of the test
Merge branch '1.5.1-SNAPSHOT' into 1.6.0-SNAPSHOT
Merge branch '1.6.0-SNAPSHOT' of https://git-wip-us.apache.org/repos/asf/accumulo into 1.6.0-SNAPSHOT

Conflicts:
	test/src/test/java/org/apache/accumulo/test/functional/DeleteTableDuringSplitIT.java
Merge branch '1.6.0-SNAPSHOT'
ACCUMULO-1961 fixing warnings
ACCUMULO-1961 fixing warnings
Merge branch '1.6.0-SNAPSHOT'
ACCUMULO-1961 Fix more recently introduced javadoc problems.
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
Merge branch '1.5.1-SNAPSHOT' into 1.6.0-SNAPSHOT (-sours)
Merge branch '1.6.0-SNAPSHOT' (-sours)
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
Merge branch '1.5.1-SNAPSHOT' into 1.6.0-SNAPSHOT
Merge branch '1.6.0-SNAPSHOT'
ACCUMULO-2354 ensure that the TabletLocationState iterator is closed