Update to 0.21.1: Fix a well known problem to fail to update the
file with the same name but a different type.

PR: 52667
Submitted by: hrs@