[automerger skipped] Merge "Fix a bug where private DNS to v4-only servers don't validate." into qt-dev
am: 036871beb8 -s ours
am skip reason: change_id I362d43ee6af318694a4038a257e1ebb3f577863c with SHA1 4b5f3a313c is in history

Change-Id: Iac5f917b8605630e73e4b50e3e4a0fb00976d832