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