[Branch ~dhis2-devs-core/dhis2/trunk] Rev 17369: Minor fix in event-service, verify that given event-id is valid, if not generate a new one