Merge pull request #4588 from danmcp/master

Merged by openshift-bot
Fixing common test case timeout