Fix for bug 990927
Fix for bug 989908
Merge pull request #3345 from abhgupta/abhgupta-scheduler

Merged by openshift-bot