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: -- You received this bug notification because you are a member of Ubuntu Server, which is subscribed to openldap in Ubuntu. https://bugs.launchpad.net/bugs/1811630 Title: Please merge openldap 2.4.47+dfsg-2 (main) from Debian unstable (main) To manage notifications about this bug go to: https://bugs.launchpad.net/ubuntu/+source/openldap/+bug/1811630/+subscriptions -- Ubuntu-server-bugs mailing list Ubuntu-server-bugs@lists.ubuntu.com Modify settings or unsubscribe at: https://lists.ubuntu.com/mailman/listinfo/ubuntu-server-bugs