Fix for bug 995034
Merge pull request #3408 from abhgupta/abhgupta-scheduler

Merged by openshift-bot