Merge pull request #6389 from RosettaCommons/roccomoretti/master_fixes Attempt to fix failing tests in master. Assorted fixes for failing tests in master