Merge pull request #3245 from agresch/agresch_storm_3606

STORM-3606 prevent Hadoop renewal thread from running (NPEs and resta…