Fixing redirected links in documentation. Rebase and fixed from #7606

Link corrections in docs.