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