Merge pull request #1362 from rajatchopra/master

Merged by openshift-bot
bz910577 - recheck on race condition