[Branch ~dhis2-devs-core/dhis2/trunk] Rev 10155: Lock exception, replaced a hack with a slightly less nasty hack. Seems like hibernate has problem...