Merge "Remove contrail_discovery from haproxy conf for OC 4.0"