NXP-11185: do not try to rename descendant if no move nor renaming occurs
Merge branch 'master' into 5.6.0