Fix for bug 1047950 and bug 1047952
Merge pull request #4421 from abhgupta/abhgupta-scheduler

Merged by openshift-bot