DERBY-3155: Forbid derived column lists in MERGE statements; commit derby-3155-23-aa-forbidDerivedColumnLists.diff.

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