ACCUMULO-2360 adding TNonblockingServer.maxReadBufferBytes setting
Merge remote-tracking branch 'origin/1.5.1-SNAPSHOT' into 1.6.0-SNAPSHOT
Merge branch '1.6.0-SNAPSHOT'
ACCUMULO-2369 Increase the sleep time and add some comments as to why
Merge branch '1.5.1-SNAPSHOT' into 1.6.0-SNAPSHOT

Conflicts:
	start/src/test/java/org/apache/accumulo/start/classloader/vfs/AccumuloReloadingVFSClassLoaderTest.java
Merge branch '1.6.0-SNAPSHOT'
ACCUMULO-2297 Remove unnecessary currentValue and add javadoc for purpose of other members
ACCUMULO-1764 Iterate over each volume and compute an overall summary of usage.
Merge branch '1.6.0-SNAPSHOT'
ACCUMULO-2350 add recommendation to use InstanceOperations methods to get/set server side configuration
Merge branch '1.6.0-SNAPSHOT'
ACCUMULO-1961 remove unused imports and variables
Merge branch '1.6.0-SNAPSHOT'
ACCUMULO-2370 remove useless call
Merge branch '1.6.0-SNAPSHOT'
ACCUMULO-2062 marking property general.volume.chooser as @Experimental
ACCUMULO-2361 fix missing space in error message
Merge branch '1.6.0-SNAPSHOT'
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