Backport versioning fixes to 16.0
What does this MR do and why?
Backports a few fixes to the 16.0 branch:
Merge request acceptance checklist
This checklist encourages us to confirm any changes have been analyzed to reduce risks in quality, performance, reliability, security, and maintainability.
-
I have evaluated the MR acceptance checklist for this merge request.
Edited by Sarah German