Updated for current jobs.
Merge branch 'pf-platform' of github.com:sydvicious/mozplatformqa-jenkins-config into pf-platform

Conflicts:
	jobs/aurora-linux64-win32/config.xml