[Bug 226515] Merge Review: unixODBC