Merge "Pin haproxy to 1.8.30-buster and fix associated issues" into stable-3.2