BS-2412 second part
Merge branch 'MasterBugFixing' of https://github.com/bonitasoft/bonita-web into MasterBugFixing