Blow away tests directory when it is expanded since the old way of doing it
was leaving obsolete test files sitting around.
Merge branch 'master' into pf-platform

Conflicts:
	jobs/expand-tests-aurora-linux64/config.xml
	jobs/expand-tests-nightly-linux64/config.xml