Misc 2.0.x

PR:
- https://github.com/inliniac/suricata/pull/1118

Bugs:
- https://redmine.openinfosecfoundation.org/issues/1273
- https://redmine.openinfosecfoundation.org/issues/1279