See commit 3f345ecb
Rename tree_resolve_copy and tree_resolve_master_copy to
tree_resolve_sanitize and tree_resolve_master_sanitize respectively.