BACKLOG-4247 Merge of the JAHIA-JBPM6-BRANCH