Addressed review comments to fix comparison of orderType.class and the validates order type - TRUNK-4217

Addressed review comments to fix comparison of orderType.class and the validates order type - TRUNK-4217

Follow up