Changes required for AXIS2-5340.
7 files changed