BUG-1421: VLAN tag

- added original match to vlan-injected match
- fixed offset of action order
- added original vlan-* actions before injecting special actions
- fixed vlan-id-present ignorance

Change-Id: I7475fcaa3d1e04a03511cf9c0c33cda6d1c9185a
Signed-off-by: Michal Rehak <mirehak@cisco.com>
Merge "BUG-1421: VLAN tag"