[VirtualBox/el7] (7 commits) ...Fix conditional again