Merge pull request #31494 from gcs278/exempt-haproxy-upgradeable