Merge branch '6.3.x' into BS-7318_MetadataPortal

Conflicts:
	console/console-war/src/main/java/org/bonitasoft/console/client/admin/organization/users/view/UpdateUserPage.java
	rest-api/rest-api-model/src/main/java/org/bonitasoft/web/rest/model/ModelFactory.java
	rest-api/rest-api-server/pom.xml
	rest-api/rest-api-server/src/main/java/org/bonitasoft/web/rest/server/api/APIAssert.java
	rest-api/rest-api-server/src/main/java/org/bonitasoft/web/rest/server/engineclient/CustomUserInfoEngineClientCreator.java
	toolkit/toolkit-view/src/main/java/org/bonitasoft/web/toolkit/client/eventbus/MainEventBus.java