Refactor SOCKS and ProxyServer to suport per instance configuration
Merge branch 'exp_config-dns-resolving' into ftr_per-instance-config
Merge branch 'ftr_per-instance-config'