DERBY-6684(Failure in testDERBY5120NumRowsInSydependsForTrigger when upgrading from 10.11.1.0 to trunk)
Backporting changes from trunk to 10.11. No futher backporting is needed because the test had started failing because of DERBY-2041(Trigger should register a dependency on tables and columns used in its body) but the change for DERBY-2041 went in 10.11 codeline



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