Minor Description
There were a few spots where the broker was masking the interrupt state after handling an InterruptedException. This is a lint pass to clean some of that up. I learned after I made this patch that it's actually slightly better stylistically to call Thread.interrupt() instead of Thread.currentThread().interrupt() since it's static and the interrupt state is global(ish), but this is the version we've tested.