ENGINE-1824: Fix conversion
Merge branch 'CoreProduct' of github.com:bonitasoft/bonita-engine into CoreProduct