Make comptool more deterministic
Merge pull request #5035

c9c51cb Make comptool more deterministic (Matt Corallo)