Manual merge of https://github.com/Activiti/Activiti/commit/e2f5d6ca5edb92ca0a27d6080b60c405ef07b745 to v6

Manual merge of https://github.com/Activiti/Activiti/commit/c4eb57ca7e1f101c0d7227c6cbba002155d84e81 to v6

Manual merge of https://github.com/Activiti/Activiti/commit/a8f730787b8d68805a805493b5bd07b212f77f13 to v6

Manual merge of https://github.com/Activiti/Activiti/commit/d7a966f0b65c1e0aa14fb75788f04ae569dbaa5a to v6: change to JobRetryCmd did not have to be applied on v6: process definition is not fetched, as the executionId is used to get the associated step in the process definition.

Manual merge of https://github.com/Activiti/Activiti/commit/d70b29b5426a1e579491e141a317fcb5ccb34ae4 to v6

Manual merge of https://github.com/Activiti/Activiti/commit/34fc5b80fabb9997579a14c2bca8b9eb33141d0a to v6

Manual merge of https://github.com/Activiti/Activiti/commit/db18e32bfb1f69699af82b9beb36ef5db9e652ff to v6

Manual merge of https://github.com/Activiti/Activiti/commit/4e4a190119813828af966c0e0bed6b193bc0ef04 to v6

Manual merge of https://github.com/Activiti/Activiti/commit/af5b2987bfc1d7dc279974e15f7eb54a1e940dc6 to v6

Manual merge of https://github.com/Activiti/Activiti/commit/806ac390a63a561759a5995ed24283391e6e8d4d to v6

Manually porting https://github.com/Activiti/Activiti/commit/f4dcc5ed3996e029ace1826bd6308c84668255eb to v6

Manual merge of https://github.com/Activiti/Activiti/commit/30bb3b60a634343bd7acfdcfd4c0517b4c23e13a to v6

Manuall porting https://github.com/Activiti/Activiti/commit/a556eced74f95d1faf37ef812c39210f1e44db02 to v6

Manual merge of https://github.com/Activiti/Activiti/commit/e538c9898fbea9c66017c7668b448f334642acb7 to v6, adapting it to different execution listener structure. It works, but should be made generic.

Manual merge of https://github.com/Activiti/Activiti/commit/ec42dc1ef7ee25689a23bb241a3ca3929e14f495 to v6

Manual merge of https://github.com/Activiti/Activiti/commit/a8f97f4b7cd67921a2b27bb38daa0d1e51f24960 to v6

Manual merge of https://github.com/Activiti/Activiti/commit/97df664e42fe39d3d6c68096174066d83ac1d60a to v6

Manual merge of https://github.com/Activiti/Activiti/commit/d094c71223f88eb6fb39655951bdd77a9ec147de to v6

Manual merge of https://github.com/Activiti/Activiti/commit/9eb58927781aa909ba0f7b3be4f01b68acad5823 to v6

Manual merge of https://github.com/Activiti/Activiti/commit/10bbd9b60f6469464dce3d30cf03511c5c3217da to v6

Bulk insert: remove semicolon at the end of bulk insert sql, mybatis adds it itself (otherwise you get funny ORA-00933: SQL command not properly ended error)

Use regular insert for one persitent object, otherwise do bulk insert. Oracle doesn't seem to like one item in the bulk insert.