Merge latest samba version to get va_end() fixes, etc.