Merge "Avoid postgres PrefixSearchTest failures due to collation differences"