Merge pull request #6431 from RosettaCommons/woodsh17/mp_unit_test Reduce time to run membrane energy term unit test