Swtiched to using resource-proxy repository for proxy
Merge branch 'proxyupdate'