Node timeout handling improvements
Merge pull request #2789 from ironcladlou/dev/timeouts

Merged by openshift-bot