Fix for bug 1046091
Merge pull request #4414 from abhgupta/abhgupta-scheduler

Merged by openshift-bot