DERBY-6314: Upgrade from 10.10 fails with ClassCastException

Merged revision 1517533 from trunk.


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