Revert "Revert "Merge branch 'CoreProduct' of https://souillac@github.com/bonitasoft/bonita-engine.git into CoreProduct""

This reverts commit 672ab12f8bf8b104a949fd6ffd3318d6895ba3f2.