Merge "Add redirect for removed file." into jb-mr1-dev