AXIS2-4927: Merged r1382245 to the 1.6 branch.


git-svn-id: https://svn.apache.org/repos/asf/axis/axis2/java/core/branches/1_6@1470128 13f79535-47bb-0310-9956-ffa450edef68
AXIS2-5511: Merged r1305728 to the 1.6 branch.


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