Merge "Add haproxy artifactory configuration"