Merge "[AAI] AAI HAProxy image update" into kohn