Merged r1612072 and r1612138 to the 1.6 branch to have a clean working copy.


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