Removes unified_inventory code duplication.
Changes to unified inventory can be merged upstream through my pull request.
Eases unified_inventory to a recommendation through depends, because reading the code proved it is checked for and not used if not there.