DERBY-6202: Fix bug involving upgrade, triggers, and dropped columns.

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