Merge "add server_option in haproxy configuration"