STUDIO-3069
Merge branch '6.0.x' of git@github.com:bonitasoft/bonita-studio.git into 6.0.x