Merge branch '1.6.0-SNAPSHOT' of https://git-wip-us.apache.org/repos/asf/accumulo into 1.6.0-SNAPSHOT
ACCUMULO-2671 Refactoring BlockedOutputStream to not recurse. With test
ACCUMULO-2690 fixing output stream short circuiting in walog
ACCUMULO-2690 expanding test to validate giant read as well
ACCUMULO-2671 adjusting test to make jenkins happy
Merge branch '1.6.0-SNAPSHOT'

Conflicts:
	core/src/test/java/org/apache/accumulo/core/security/crypto/BlockedIOStreamTest.java