Merge from HEAD - make Samba compile with -Wwrite-strings without additional