Fix for bug 1024493
Merge pull request #4042 from abhgupta/abhgupta-scheduler

Merged by openshift-bot