ACCUMULO-2344 Avoid usage of UtilWaitThread because we want to exit gracefully on interrupt.
Merge branch '1.5.1-SNAPSHOT' into 1.6.0-SNAPSHOT
Merge branch '1.6.0-SNAPSHOT'