Fix for bug 1005151
Merge pull request #3579 from abhgupta/abhgupta-scheduler

Merged by openshift-bot