[xorg-x11-drv-nvidia/f25] (11 commits) ...Merge branch 'master' into f25

Summary of changes: 836186e... Update nvidia.conf for latest Xorg changes (*) ad8a614... revert leftover from some testing (*) 19ec459... Changes for mesa glvnd (*) 3cfcb55... add missing python2 buildrequires (*) a0ba7b9... add python version to shebang (*) c20013d... Add conditions for f24 and el7 (*) 75e76f9... Fix missing el7 conditional (*) 9bb7058... Add conditions for el7 as there is no wayland (*) 12830ee... fix last commit (*) 8295212... Fix file conflict with filesystem (*) dc51e40... Merge branch 'master' into f25 (*) This commit already existed in another branch; no separate mail sent