[Freeipa-devel] [freeipa PR#5061][opened] This is a manual backport of