forwardport #9388 rename/remove column preserves custom PK.

Forwardport the test-case.