BS-10582
fix npe
BS-10582
fix npe

Conflicts:
	bundles/plugins/org.bonitasoft.studio.common/src/org/bonitasoft/studio/common/NamingUtils.java
Merge branch '6.3.x' into MasterBugFixing

Conflicts:
	bundles/plugins/org.bonitasoft.studio.common/src/org/bonitasoft/studio/common/NamingUtils.java