Merge pull request #5856 from RosettaCommons/everyday847/cyrus_atom_type_updates MM atom type updates