Add OrderTypeValidator - TRUNK-4311

Follow up