Issue 7686 - better logic for detecting e10s