Fix maligned merge for uri -> config in ip_locations

Issue US336