Rethrow errors thrown by .test.fail if they don't bubble up
Test fixes for Test.fail changes

@bug W-2443224@
@rev gtorres@
Merge branch 'tbliss/master-pending-pr142'