customer bill/ship location refactoring, #940