Merge "Support disabling host verification in naming service"