ACCUMULO-2344 interrupt the current thread when we catch the InterruptedException.
Merge branch '1.5.1-SNAPSHOT' into 1.6.0-SNAPSHOT