[VirtualBox/f28] (2 commits) ...Remove Conflicts between subpackages server and guest-additions