Merge pull request #1754 from RosettaCommons/jyesselm/thermal_sampler_legacy Restore 'legacy' thermal sampler, rename 'current' thermal sampler to alpha