Backport fix for PHOENIX-20: Single Key(s) not recognized by optimizer when table is salted