NEXUS-7769: Get rid of xstream "hack"

That actually coupled old restlet DTOs and internal
models