Bug 1083544: Make membership change ops re-entrant on failure