refs #16851. A few additional adjustments such to get 100% success on both FF17 (latest ESR) and FF19 (latest non-ESR). Thanks Adrian Vasiliu (IBM, CCLA)