Add support for ip_hash on upstreams
Merge branch 'master' into proxy_ignore_client_abort