Merge "Load IA resolver settings from resolver package" into oc-dev