Backport Catch.hpp changes to 9.1.x#8844

randall wants to merge 2 commits intoapache:9.1.xapache/trafficserver:9.1.xfrom

randall:backport_catch_9.1.xrandall/trafficserver:backport_catch_9.1.xCopy head branch name to clipboard