Added Nullpointer-check in parseBPMNEdge
ACT-1391: unexpected errors while parsing BPMN no longer ignored, but
bubbled up
ACT-1318: added test case for bug report. Can't reproduce the bug from the issue, but still committing the tests nonetheless as they are useful
ACT-1334: standalone task has two owners (Explorer)
Disabled ProcessDiagramRetrievalTest, as it fails on JDK 7. Enabled tests which were excluded and whose jira issue was resolved.
Trying to fix strange cache issue on QA
Re-introducing caching now we found the culprit (overzealous caching in the ResourceActivitiTestCase, where it would add an in-memory H2 driven process engine, which would then be picked up by the PluggableActivitiTestCase). This makes running the tests again faster.
Adding extra destroy to PluggableActivitiTestCase, just to be sure
Fix for ACT-1290: TaskService.saveTask(Task) does not enforce optimistic locking
Removing @deprecated annotation from account
ACT-1415: Timer declarations on start-events can now contain expressions
Fix for ACT-1259
Additional index on PROC_INST_ID_ and ACT_ID_ for historic activity
Adding alter-table statement instead of inline-define of unique
constraint inline to have consistent naming of indexes
Conflicts:

	modules/activiti-engine/src/main/resources/org/activiti/db/create/activiti.db2.create.history.sql
ACT-1424: Job timestamp defaults to current date when set to null (MySQL)
fix for ACT-1427: Repeating timer in combination with cancelActivity should not repeat itself
Fix failing drop script on MySQL
HEMERA-3572 Activiti merge: prefixing dropping of index in mssql drop script. See 0d3b578067258fdea8a4f033b95cda3efd8d56e9
Fix for ACT-1410: remove byte array from db for attachment
Fix for ACT-1431: Invalid warning with exception thrown when di information is missing
Fix for ACT-1147: Posting a comment to a task causes an exception (Bad value for type long)