Draft -- see if CI is green with cherry-pick of 5dc8dea8695786daec491a6655f99c0791e47f5c

[jlucovsky]

Make sure these boxes are signed before submitting your Pull Request -- thank you.

• [ ] I have read the contributing guide lines at https://docs.suricata.io/en/latest/devguide/contributing/contribution-process.html
• [ ] I have signed the Open Information Security Foundation contribution agreement at https://suricata.io/about/contribution-agreement/ (note: this is only required once)
• [ ] I have updated the user guide (in doc/userguide/) to reflect the changes made (if applicable)
• [ ] I have created a ticket at https://redmine.openinfosecfoundation.org/projects/suricata/issues (if applicable)

Link to ticket: https://redmine.openinfosecfoundation.org/issues/

Describe changes:

Provide values to any of the below to override the defaults.

• To use an LibHTP, Suricata-Verify or Suricata-Update pull request, link to the pull request in the respective _BRANCH variable.
• Leave unused overrides blank or remove.

SV_REPO= SV_BRANCH= SU_REPO= SU_BRANCH= LIBHTP_REPO= LIBHTP_BRANCH=