merge trunk and bugfix linkbackuri jaxb