Merge some merge changesets from main 5.1 into 5.1-build.

The base changes were backports from later 5.1 into 5.1.34sp1,
so there are no code changes associated with this merge.