[master/rhel7/f21] Two more entropy-related issues