Merge pull request #3692 from RosettaCommons/weitzner/restore_conda_mac Restore conda pyrosetta build on macOS