Merge pull request #1803 from RosettaCommons/hahnbeom/lkball_fix fixing "cannot find water builder" issue with NCAAs