DERBY-3155: Fix bug in MERGE statement fired by a trigger; commit derby-3155-53-aa-transitionSimpleColumn.diff.

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