Merge "Copy ml2_conf.ini, haproxy.cfg and dhcp_agent.ini"