proxy url normalization

more simple
Merge branch 'pr-1095' into presubmit-master-pr-1095