Merge "Improve the way to deploy onap via proxy"