update for Carp stack trace change

Fixes #957 and RT#88136
Original patch
Merge branch 'carp-tests' into devel