Fix fruit_rename problems

VLrequested to merge
samba-team/devel/samba:vl/90fc5b9fbca into master

Merge request reports