Merge "Fix proxy configuration for sl-os-ovs"