OPENENGSB-3610 - Fix lifecycle mappings