ACCUMULO-2760 just wait for the tserver to die if the wait was long; timeout means it failed to die
Merge branch '1.6.0-SNAPSHOT'