Return an error instead of dying if flavor can't be detected.
Making this test a lot less flaky, wait on the condition.
Merge branch 'detect'
Merge branch 'resharding'
Fix flakiness in vtgatev2_test