[jbossws-dev] Merging changes for JBWS-2895