TRUNK-4133 - Ensure discontinue and discontinued orders have the same concept