Fix for bug 989650, bug 988115, and added additional check in oo-admin-chk
Merge pull request #3213 from abhgupta/abhgupta-scheduler

Merged by openshift-bot