merge ^/aries/trunk/proxy - r1844786 thru r1855479 into proxy

git-svn-id: https://svn.apache.org/repos/asf/aries/branches/java6support@1855481 13f79535-47bb-0310-9956-ffa450edef68
3 files changed