[xorg-x11-drv-nvidia/el7: 6/6] Merge branch 'f30' into el7