oo-admin-chk refactor
Bug fixes - 1040314, 1040312, 1040305
Merge pull request #4022 from pravisankar/dev/ravi/oo-admin-repair-changes

Merged by openshift-bot