Merge "Do not run test_create_server_with_scheduler_hint_group twice"