Remove broken links and outdated TOC content.
Cleanup more broken link in in-page TOCs
Merge branch 'master' into 3.6