Merge branch '7.13.x'

# Conflicts:
#	community/server/src/main/java/org/bonitasoft/console/common/server/page/CustomPageService.java
#	community/server/src/main/java/org/bonitasoft/web/rest/server/datastore/bpm/process/ProcessDatastore.java
#	community/server/src/main/java/org/bonitasoft/web/rest/server/datastore/page/PageDatastore.java
#	community/server/src/test/java/org/bonitasoft/console/common/server/page/CustomPageServiceTest.java
#	community/server/src/test/java/org/bonitasoft/web/rest/server/datastore/bpm/process/ProcessDatastoreTest.java
#	community/server/src/test/java/org/bonitasoft/web/rest/server/datastore/page/PageDatastoreTest.java