oo-admin-repair refactor
Added repair for usage inconsistencies

Bug fixes 1048712, 1048685, 1045343