Merge pull request #4594 from RosettaCommons/revert-4585-bcov/longxing_bp_builder Revert "FoldTreeFromMotif and TargetClashEnergy"