Merge "add MatchFieldType for tcp flags"