Fix to avoid NPE when editing data, it was broken when fixedReturnedType
was implemented
Merge branch 'CoreProduct-6.1.x' of https://github.com/bonitasoft/bonita-studio.git into CoreProduct-6.1.x