oo-admin-repair refactor
Added repair for usage inconsistencies

Bug fixes 1048712, 1048685, 1045343
Merge pull request #4404 from pravisankar/dev/ravi/repair-changes

Merged by openshift-bot