Fix misidentification of SOCKS traffic. Traffic that had a certain bytestring would get incorrectly identified as SOCKS. This seemed to happen a lot with DCE/RPC traffic.
Merge remote-tracking branch 'origin/master' into topic/vladg/socks_fix
Merge remote-tracking branch 'origin/topic/vladg/socks_fix'

* origin/topic/vladg/socks_fix:
  Fix misidentification of SOCKS traffic. Traffic that had a certain bytestring would get incorrectly identified as SOCKS. This seemed to happen a lot with DCE/RPC traffic.

Tweaked the error message and added SetSkip() to the "reserved" case
as well.

BIT-1130 #merged
Support for MPLS over VLAN.

Patch by Chris Kanich.

BIT-1017 #merged