Fix OID collision

First, very rough cut

Do raw syscache lookup for raw column ref

Works, more or less

Clean up, make merge path mandatory for UPDATE
Restore parserOpenTable
More clean-up