Follow up to clean up the code that finds an active to discontinue when a DC order is saved - TRUNK-4133

Follow up to discontinue order - TRUNK-4133

Follow up to clean up the code that finds an active to discontinue when a DC order is saved   - TRUNK-4202