DERBY-3155: Add support for ? parameters to MERGE statements; commit derby-3155-24-aa-supportParameters.diff.

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