Fix for bug 997008
Merge pull request #3937 from abhgupta/abhgupta-scheduler

Merged by openshift-bot