Bug #1215138 - module changes for HA

Remove HA-related modules we don't use

Add HA-related modules we do use