CMS-4147 Stop modules from being deselected after start/stop