[Branch ~dhis2-devs-core/dhis2/trunk] Rev 1883: Made changes in code for stype dataelement and ifa