DERBY-3155: Add lock mode comment to master MERGE node; commit derby-3155-36-aa-lockModeComment.diff.

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