Conflicts:
	jbpm-bpmn2/src/test/resources/BPMN2-BusinessRuleTaskDynamic.bpmn2
	jbpm-bpmn2/src/test/resources/BPMN2-BusinessRuleTaskWithDataInputs.bpmn2

BZ874104 - Human-task queries for JPA2 seem to fail - remvoed db specific config, added new column for I18NText to be querable

    (cherry picked from commit 72183a6c)

Ensuring that JPA2 configuration files are used correctly and not duplicated. (cherry picked from commit 62727bf6)

- All extra query and mapping files are only located in one place, now:
  the original jar in which they're used (jbpm-human-task,
  jbpm-persistence-jpa).
- Also removed orig-schema.ddl and xml-switch.sh files which are
  leftovers from an old experiment

JBPM-3589 BZ 854612: Added a ExtraIndexes.hbm.xml file to add deadlock-blocking index for EventTypes.instanceId. (cherry-pick of 9f8c77c5)

(cherry picked from commit 2e3c88be)

BZ-840530 Added completedOn field to TaskData class and Task table (cherry picked from commit 1110712b)

(cherry picked from commit f4f1b84dab836313d708687a73028c81c3619c3b)

release

JBPM-3831 - 2^x 'garbage' timers are created when rolling back a transaction that involves the execution of a process that includes a timer

BZ862296 - IllegalArgumentException when opening Business Central - ensure that exception on fireAllRules on session init will not break initialization

BZ-871899 - Creation of getTasksByProcessInstanceIdStatus and getTasksByProcessInstanceIdStatusTaskName as public API

(cherry picked from commit a98e2814)

- [installer] download only as specific version of console and ht server, enable to configure persistence for different db
(cherry picked from commit a8e6a10c)

(cherry picked from commit d794b563)

- removed persistence configuration from installer and created assemblies for console and ht for AS5
(cherry picked from commit 682702f2)

(cherry picked from commit 7bd65c82)

 - updating form builder url