ACCUMULO-2170 Fix up changes, split 1.5.1 changes from 1.5.0 changes, and update for recent fixes since rc1
ACCUMULO-2356 Remove terrible static blocks and use BeforeClass annotations.
Merge branch '1.5.1-SNAPSHOT' into 1.6.0-SNAPSHOT

Conflicts:
	start/src/test/java/org/apache/accumulo/start/classloader/vfs/providers/VfsClassLoaderTest.java
	start/src/test/java/org/apache/accumulo/test/AccumuloDFSBase.java
Merge branch '1.6.0-SNAPSHOT'
ACCUMULO-2170 Add the new test fix
Merge branch '1.5.1-SNAPSHOT' into 1.6.0-SNAPSHOT
Merge branch '1.6.0-SNAPSHOT'
ACCUMULO-2170 Collapse down spacing and remove 1.5.0 changes.
Merge branch '1.5.1-SNAPSHOT' into 1.6.0-SNAPSHOT

Conflicts:
	CHANGES
Merge branch '1.6.0-SNAPSHOT'
ACCUMULO-2170 Remove the -RC suffix from the tag name
Merge branch '1.5.1-SNAPSHOT' into 1.6.0-SNAPSHOT
Merge branch '1.6.0-SNAPSHOT'
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