DERBY-3155: Add test for MERGE statement which fires triggers involving generated columns; commit derby-3155-42-aa-triggersAndGeneratedColumns.diff.

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