CMS-4083 Improve lifecycle services for our modules.