Fix-up several packages to include the correct Conflicts and Replaces