allow using xvfbwrapper on linux for selenium tests
re-added the env var setting that got lost in the last merge
Merge remote-tracking branch 'origin/develop' into xvfbwrapper

Conflicts:
	develop.py
Merge pull request #2722 from ojii/xvfbwrapper

allow using xvfbwrapper on linux for selenium tests