ACCUMULO-3289 Increase memory as it appeared the one tserver might have had irregular timer thread activity
Merge branch '1.6'

Conflicts:
	test/src/test/java/org/apache/accumulo/test/functional/BulkFileIT.java