[Branch ~dhis2-devs-core/dhis2/trunk] Rev 18011: minor fixes, report validation errors back as conflicts, if not a sharing import.. clear out sharing