DERBY-6247; updatelocksJDBC30 test failing in nightly regression tests
  addressing the issue by merging the test into junit test UdateLocksTest.java


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