Bug 7182 related: Remove M2E lifecycle mapping