[Branch ~dhis2-devs-core/dhis2/trunk] Rev 13335: Impl support for saving single data values with attribute option combo in web api. Re-arranaged m...