NEMO-2667 Fix merge error. Bring back our version of code that update order total for open order after a promotion/taxrate is deleted.
Merge pull request #19 from godaddy/2667

NEMO-2667 Fix merge error. Bring back our version of code that update or...