Merge "Fix HAPROXY ${i} index to be just '1'"