addressing derby unit test failures

(this is a result of CAY-1836 patches that we haven't tested on Derby)

git-svn-id: https://svn.apache.org/repos/asf/cayenne/main/trunk@1507827 13f79535-47bb-0310-9956-ffa450edef68