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