r13776: Merge in the editposix ldapsam optimization