EPICs - Fix tests that have started to fail due to code throwing
exceptions rather than logginf warnings.
Merge remote-tracking branch 'origin/8.34'