Fix for bug 1038730
Merge pull request #4292 from abhgupta/abhgupta-scheduler

Merged by openshift-bot