Merging patch0006 changes to axis2 code in git repo