apply fixes from last attempt for freeipa