DERBY-3155: Add a test for MERGE statements which sometimes put nulls into generated columns and sometimes don't; commit derby-3155-41-aa-nullGeneratedColumns.diff.

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