Merge "[AAI] Haproxy user updated in config" into jakarta