Git even with -M -C -C couldn't detect all renames in modified files, so rename in a separate commit. Approved by: rust (tobik) Differential Revision: https://reviews.freebsd.org/D18858