Here I repeat once more the most important questions you missed:
I want you to ...
1. separate the mixed changes into logical units, and apply them
to *trunk* taking at least one revision for each logical unit,
2. submit merge request for each logical unit.
Would you please do this?
Could you please revert r19130 for now? not to be mixed with merges
for other fixes.
Let's discuss for each changes individually after that.