Merge remote-tracking branch 'origin/master'

Conflicts:
	RallyAutomation/src/test/run/testCase.py
Delete config.cfg