[VirtualBox: 17/17] Merge branch 'el7'