VLAN, QinQ fixes

https://redmine.openinfosecfoundation.org/issues/814
https://redmine.openinfosecfoundation.org/issues/1103
https://redmine.openinfosecfoundation.org/issues/1104

Prscript:
- PR build: https://buildbot.suricata-ids.org/builders/inliniac/builds/187
- PR pcaps: https://buildbot.suricata-ids.org/builders/inliniac-pcap/builds/107