r23309: sync lib/replace with SAMBA_4_0