Merge branch 'hotfix-2.3.30'
Merge branch 'hotfix-2.3.31'
Merge branch 'hotfix-2.3.31'
Fix to an issue with the markings in the STIX export

- xpath describing the current node and descendants is incorrect
Merge branch 'hotfix-2.3.32' into develop