Changed enum comparisons to use == and !=

Changed enum comparisons to use == and !=
Allow editing discontinuation orders - TRUNK-4363

Follow up - TRUNK-4363