[Branch ~dhis2-devs-core/dhis2/trunk] Rev 18403: minor fixes to controllers, use selected MergeStrategy

revision-diff.txt (10.3 KB)