Fix for bug 989650
Merge pull request #3237 from abhgupta/abhgupta-scheduler

Merged by openshift-bot