Merge branch 'samples-fixes' of https://github.com/bill-looby/axis-axis2-java-rampart into samples-fixes