NXP-15211 fixup tests related to integrated container with tx and datasource helpers
NXP-15211 don't automatically close mapper in non-transactional mode