NXP-10308: changes to work with single-datasource mode
Merge branch 'master' into feature-NXP-10308-single-datasource
NXP-10308: more tests; fix hibernate afterCompletion order