Backport 50ee7529ec45 from 5.4

Cherry pick 50ee7529ec45 from mainline. This addresses a lack of early entropy in certain environments.

This addresses https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=948519, and probably https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=931644