ACCUMULO-2658 Don't read more than the configured maximum amount of data for the proxy thrift server
Merge branch '1.5.2-SNAPSHOT' into 1.6.1-SNAPSHOT
Merge branch '1.6.1-SNAPSHOT'