We have to adapt the mixed domain test cases to validate the product releases. We could handle these details directly at upstream instead of managing them when we are taking care of a product release.

The task here is to make the mixed domain tests aware of the kind of product they are testing and, if there are any relevant handling differences known, then handle it at upstream instead of in product conversion branches.

That will reduce the necessary steps to adapt these tests to the current server version.