Squashed 'suricata/' changes from 90398e9..affdefa

affdefa New upstream bug fix release

git-subtree-dir: suricata
git-subtree-split: affdefa0be490dae74954e9a7306f25fd58b53a7
Merge in Suricata 2.0.5 from fedora master.