Merge "Test for patchlevels and too much entropy"