Merge pull request #1660 from RosettaCommons/everyday847/ncnts_in_stepwise NCNTs in stepwise: Integration test changes are all spurious (new EnergyMethodOption, in particular, causes ~50).