Merge "Use haproxy-systemd-wrapper as pid1 in containerized Haproxy" into stable...