merged 1479351, AXIS2-4221 fixes to branch

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