Added an option for upstreamProxy
Merge branch 'proxy'