Merge from 3.2. (Issue #15044: Handle Fedora 17's approach to ndbm compatibility)