Merge pull request #2123 from RosettaCommons/guffysl/residue_type_constraint_generator Guffysl/residue type constraint generator