Bug 1044417 - Fix storage inconsistencies in oo-admin-chk