BS-7173
Fix npe and tab size
Merge branch 'master' of git@github.com:bonitasoft/bonita-studio.git