I did the merge in our usual way, and added your nssov changes, and the end result was identical. I'm now just going to quickly test the upgrade.
One small thing only: please close this bug in the d/changelog file. Something like this: openldap (2.4.47+dfsg-2ubuntu1) disco; urgency=medium
* Merge from Debian unstable (LP: #1811630). Remaining changes:
I did the merge in our usual way, and added your nssov changes, and the end result was identical. I'm now just going to quickly test the upgrade.
One small thing only: please close this bug in the d/changelog file. Something like this: dfsg-2ubuntu1) disco; urgency=medium
openldap (2.4.47+
* Merge from Debian unstable (LP: #1811630). Remaining changes: