Merge pull request #2866 from RosettaCommons/everyday847/cps_part_three Third part of cyclic peptide stepwise merge