Merge pull request #6328 from RosettaCommons/stenheinze/daniel_marzolf_hdxenergy [RosettaCommons/main] Stenheinze/daniel marzolf hdxenergy