Added MPLS_BOS and TUNNEL_ID support to SFP, since Loxi now supports it. Also changed MatchUtils's fromString() function's header to include the updated syntax for fields.