Merge pull request #5054 from RosettaCommons/benchmark various fixes in preparation to update Mac testing server to Catalina