Merge pull request #6297 from RosettaCommons/roccomoretti/fix_master Fix broken tests in master. Fix a number of broken tests in master.