switch to jaxb unmarshal
Merge remote-tracking branch 'origin/master' into hibernate-3.6.10.Final