Merge "Add verbose output to containerized cell_v2 host discovery" into stable/pike