Eliminate circular dependency provision-persistence <> ocs-inventory