Merge branch 'SLE15-SP3-UPDATE' into SLE15-SP3
This is a one-off merge to prepare for the kabi soft freeze.
The branch maintainers have talked to project management about how to do the
kabi freeze after the GA and Update branches have diverged since the split.
After reevaluating the current state of the two SLE15-SP3 and SLE15-SP3-UPDATE
branches, it is clear that the kabi differences have become non-trivial in the
matter of weeks.
The problem is, the GA/Update split happened before the soft kabi
freeze. We let development continue to happen as usual on the
Update branch (without any kabi constraints, since there is no freeze
yet), while effectively feature freezing the GA branch.
With development continuing as usual on the Update branch, naturally,
its kabi will shift around and change.
The result now is that the GA branch has a very different kabi from
the Update branch, and we cannot freeze the branches under a single
kabi like this (they're too different).
The fact of the matter is, we will either have two different kabi between GA
and the first Maintenance update (most likely unacceptable). The simplest
solution is to merge the Update branch back into the GA branch to create a
unified kabi and freeze from this point forward.
Yes, this effectively disregards the feature freeze that had been put in place
up until now. But project management has agreed to make an exception to
accomodate the kabi problem.