Bug 2127: Fixed bugs in MatchConvertorImpl.fromOFMatchV10ToSALMatch().

  * TOS value in NW_TOS match field needs to be converted into
    IP DSCP value.
  * DSCP match field should be configured into a MD-SAL match unless
    NW_TOS wildcard bit is set in OF10 match.

(cherry picked from commit c7eea8325b0c60b02a98a84f1be1852875c9779f)
Change-Id: Ie4d5dbf8a9db564a0e6785fea880b0d78cc1f499
Signed-off-by: Shigeru Yasuda <s-yasuda@da.jp.nec.com>
Signed-off-by: Michal Rehak <mirehak@cisco.com>