DERBY-3155: Run all MERGE tests with and without collations; commit derby-3155-47-aa-collations.diff.

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