[nvidia-xconfig/el7] (6 commits) ...Merge branch 'f30' into el7