re #9734 3rd pass of the links
Merge remote-tracking branch 'origin/feature/9734_Fix_links_in_sphinx'