Merge changes from trunk.

git-svn-id: https://svn.apache.org/repos/asf/axis/axis2/java/rampart/branches/RAMPART-390@1781857 13f79535-47bb-0310-9956-ffa450edef68