Merge "Update global haproxy to match OOO"