ACCUMULO-3441 use the proper TServerStatus object to update current instances
Merge branch '1.6' of https://git-wip-us.apache.org/repos/asf/accumulo into 1.6