ACCUMULO-2526
Merge remote-tracking branch 'origin/1.5.2-SNAPSHOT' into 1.6.0-SNAPSHOT

Conflicts:
	assemble/src/main/assemblies/binary-release.xml
ACCUMULO-2522 fix timeout typo
Merge branch '1.5.2-SNAPSHOT' into 1.6.0-SNAPSHOT

Conflicts:
	proxy/src/test/java/org/apache/accumulo/proxy/SimpleProxyIT.java
save1
save2