[Branch ~dhis2-devs-core/dhis2/trunk] Rev 17173: Analytics table, moved _dataelementstructure out of approval subquery into main query