[389-devel] please review: Ticket 47620 - Fix crash caused by fixing cherry-pick problems for 1.3.2 & 1.3.1