[Branch ~dhis2-devs-core/dhis2/trunk] Rev 2130: Simplified resource table generation, avoid locking issues

Support - Assistance technique
#1