ACCUMULO-3146 Also give the tserver a bit more heap to make sure the tserver doesn't die.
Merge branch '1.6'