Fix for bug 985496
Merge pull request #3270 from abhgupta/abhgupta-scheduler

Merged by openshift-bot