Merge pull request #4534 from RosettaCommons/rpavlovicz/ddg_water_min_fix fix control of rigid body movement of waters during minimziation of d…