AXIS2-4723: Applied Hiranya Jayathilaka's patch containing a refactored and improved...