Merge pull request #3332 from agresch/agresch_storm_3696

STORM-3696 don't ignore InterruptedException