Rustdoc improvement round number 45

This slurps in the commits from #9684 as well as closing #9539.