DERBY-3155: Forbid MERGE statements in soft-upgraded databases; commit derby-3155-52-aa-upgrade.diff.

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