Merge changes I99269436,I04fe75c0

* changes:
  Remove superfluous environment variables in test configurations.
  Move gcstress test configurations to use the CC collector.