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