Merge pull request #4591 from RosettaCommons/roccomoretti/quickfix_master Quick fixes for master tests. Recent commits of mine broke the clang tidy and xcode tests on the server. This PR should fix them.

• Summary