Fix for bug 1025033
Merge pull request #4055 from abhgupta/abhgupta-scheduler

Merged by openshift-bot