proxy-server complete; removed commit message

Change-Id: I06c028cdda33cc4d2cf81822d794ed81cc9c2dd2