Merge pull request #3654 from clumens/cts-choose-multiple
Test: cts-lab: Allow running multiple tests with the --choose argument.