More tolerance adjustments
refs #3584
Merge commit '552e8aa634b9a9fbdaa6385e707b552c44108d2a'