[Branch ~dhis2-devs-core/dhis2/trunk] Rev 331: Small rearrangement of xwork config files