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