fixing merging issues for HA classes for mysql and RHOS