Encrypted heartbleed v1.6

Prscript:
- PR build: https://buildbot.suricata-ids.org/builders/inliniac/builds/288
- PR pcaps: https://buildbot.suricata-ids.org/builders/inliniac-pcap/builds/206