Merge "[patch] haproxy hostname parameterization upstream"