Reverted Derby back com.springsource.org.apache.derby 10.5.. See T3-1197