[Branch ~dhis2-devs-core/dhis2/trunk] Rev 163: Committing Derby fixes that don't break other things.