Merge "aaa_ha_freeipa updates"