BS-6617
Merge branch 'master' of git@github.com:bonitasoft/bonita-studio.git