AXIS2-5781: Merge r1787676 to the 1.7 branch.
12 files changed