Merge "Add Rfc6724 style sort for DnsResolver and fix potential bug"