DERBY-3155: Make MERGE statement serialize SQLRefs rather than HeapRowLocations; commit derby-3155-17-aa-serializingRowLocations.diff.

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