Merge branch '1.4.5-SNAPSHOT' of https://git-wip-us.apache.org/repos/asf/accumulo into 1.4.5-SNAPSHOT
ACCUMULO-2350 add recommendation to use InstanceOperations methods to get/set server side configuration
ACCUMULO-1961 remove unused imports and variables
ACCUMULO-2370 remove useless call
ACCUMULO-2062 marking property general.volume.chooser as @Experimental
ACCUMULO-2361 fix missing space in error message
ACCUMULO-2361 IT to reproduce
Merge branch '1.5.1-SNAPSHOT' into 1.6.0-SNAPSHOT

Conflicts:
	server/master/src/main/java/org/apache/accumulo/master/tableOps/DeleteTable.java
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
Merge branch '1.5.1-SNAPSHOT' into 1.6.0-SNAPSHOT
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
ACCUMULO-1961 fixing warnings
ACCUMULO-1961 fixing warnings
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)