BS-2183
Merge branch 'BS-676' of git@github.com:bonitasoft/bonita-web.git into BS-676