Merge pull request #4353 from RosettaCommons/JackMaguire/fix_INCLUDED_core_scoring_util_methods_DumpTrajectoryEnergy_hh
Fixing #ifdef and duplication
#3575 copied a file but didn't update the ifdef include guards. The duplicate_header_guards test failed but was ignored because it blended in with a lot of other failed integration tests (presumably expected failures).
This PR fixes the #ifdef duplication but there might be a bigger problem here. Was src/core/energy_methods/DumpTrajectoryEnergy.hh even supposed to make it into master? Its namespaces are incorrect and it's a perfect duplicate of src/core/scoring/util_methods/DumpTrajectoryEnergy.hh
Tagging @vmullig because it was his PR, and @bcov77 because github credits this file to him.