[upstream] Fix building LVM2 with new version of readline (6.3)
[upstream] Fix cyrus-sasl for x86_64.