Fix for bug 990927
Merge pull request #3357 from abhgupta/abhgupta-scheduler

Merged by openshift-bot