samba36: reorganize patches, fix windows 7 compatibility