Follow up to change the structure of order_type_class_map table - TRUNK-4288