Fix ZfcUser XML mapping and references in Mapper classes