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
ACCUMULO-2625 Remove build warnings for 1.4
ACCUMULO-2529 Show compiler warnings in maven build
Merge branch '1.4.6-SNAPSHOT' into 1.5.2-SNAPSHOT

Conflicts:
	pom.xml
	src/core/pom.xml
Merge branch '1.5.2-SNAPSHOT' into 1.6.0-SNAPSHOT

Conflicts:
	pom.xml
Merge branch '1.6.0-SNAPSHOT'
ACCUMULO-2695 Fixed Conditional writer hang caused by tablet server fault

This change fixes issues that occurred when the conditional writer got an
exception when trying to connect to a tserver.  The conditonal writer could
throw an exception or loose mutations in this case.  In either case the client
would hang.
Merge branch '1.6.0-SNAPSHOT'
ACCUMULO-2686 Label classes with correct @since tag
Merge branch '1.6.0-SNAPSHOT'
Merge remote-tracking branch 'origin/master' into ACCUMULO-378
ACCUMULO-378 Removed this for testing, replacing.