[nvidia-xconfig/el7: 2/2] Merge branch 'f30' into el7