[nvidia-kmod/el7: 4/4] Merge branch 'master' into el7