Merge "Cherrypick from git_tm-dev: Fixing broken {docroot} links"