Improve stream and proto detection interaction

https://buildbot.suricata-ids.org/builders/inliniac/builds/70