Brought in changes from TfsTestCaseAutomator