Fix for bug 991398
Merge pull request #3417 from abhgupta/abhgupta-scheduler

Merged by openshift-bot