2117 queue interrupt

Fixes #2117 queue.offer and queue.take don't throw interruptedexceptions.

Once this PR is merged, I'll make a backport for 3.maintenance.