BUGFIX: Asset usage prevent orphaned asset usage entries in case of a rebase with conflicts

BUGFIX: Asset usage prevent orphaned asset usage entries in case of a rebase with conflicts #5346