Merged r1455697 and r1456067 to the 1.6 branch to stabilize the build.


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