Merge changes Ieb67513a,I10b60a6c

* changes:
  Fix address family check in extractIpAddressAnswers()
  Fix wrong domain type in runResNqueryCheck()