Merge pull request #8325 from mwhudson/do-not-use-X

Stop using -X flag to set global variables