[VirtualBox-kmod/el7: 8/8] Merge branch 'master' into el7