Merge "Refactor cellv2 host discovery logic to avoid races" into stable/pike