Merge pull request #2854 from RosettaCommons/everyday847/cps_part_two Second part of cyclic peptide stepwise PR.