You can side with the soldier; when you say you believe him that completes the quest. If you return to Locke after that you can accuse him of using you to extort money, but (at least in D2:ED) that only results in him raising his prices. You can simply avoid that conversation option, though, if you wish to keep the option of being able to trade with him.
