Added logic that checks order for both shipping and billing addresses
Removed billing address logic.  Cleaned up shipping address logic
Fixes
Merge pull request #2256 from ten24/feature-orderbillship-orderFulfillmentOveride-ds

Feature orderbillship order fulfillment overide ds