Merge "One more legacy symlink." into jb-mr1-dev