ACCUMULO-3441 use the proper TServerStatus object to update current instances
Merge branch '1.6'