DERBY-3155: More improvements to column resolution in MERGE statements; tests passed cleanly for me on derby-3155-30-ab-moreCorrelationNames.diff.

git-svn-id: https://svn.apache.org/repos/asf/db/derby/code/trunk@1571808 13f79535-47bb-0310-9956-ffa450edef68