Merge "Allow sress test runner to skip based on available services"