New upstream bug fix release

- Use the system libhtp library
Merge branch 'master' into epel7
- Resolve conflicts on suricata.spec.
- Keep using bundled libhtp.