Merge pull request #2852 from RosettaCommons/everyday847/everyday847/cps_maybe_no_patch_renames Part one of my big cyclic peptide stepwise merge