make 2.0 branch into trunk

git-svn-id: https://svn.apache.org/repos/asf/commons/proper/proxy/trunk@1579340 13f79535-47bb-0310-9956-ffa450edef68