Merge proposals dependent on lp:~oisf/suricata-daily-git-test/suricata-packaging-git-allarch

1. suricata-packaging-git-allarch
2. Dependent merge proposals