Fix for bug 990956
Merge pull request #3320 from abhgupta/abhgupta-scheduler

Merged by openshift-bot